summaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-config_gitlab.yml.example
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2020-02-02 08:33:32 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2020-02-02 08:33:32 +0000
commit5b4343fb1bea375c4e0eb440bb4b623befb57c54 (patch)
tree8afe6de013419317ddb14203fc9c2cf3dc5f24d9 /www/gitlab-ce/files/patch-config_gitlab.yml.example
parentUpdate to 11.0.0 which is required for gitlab-ce 12.7. (diff)
Update to 12.7.5.
Changelog: https://about.gitlab.com/releases/2020/01/22/gitlab-12-7-released/ https://about.gitlab.com/releases/2020/01/24/gitlab-12-7-2-released/ https://about.gitlab.com/releases/2020/01/30/security-release-gitlab-12-7-4-released/ https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
-rw-r--r--www/gitlab-ce/files/patch-config_gitlab.yml.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index aa04862513b3..15503988bfe1 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2020-01-02 15:06:44 UTC
+--- config/gitlab.yml.example.orig 2020-01-31 21:59:11 UTC
+++ config/gitlab.yml.example
-@@ -910,7 +910,7 @@ production: &base
+@@ -916,7 +916,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@@ -9,7 +9,7 @@
# 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.
-@@ -928,8 +928,8 @@ production: &base
+@@ -934,8 +934,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@@ -20,7 +20,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
-@@ -975,12 +975,12 @@ production: &base
+@@ -981,12 +981,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
-@@ -1005,7 +1005,7 @@ production: &base
+@@ -1011,7 +1011,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git: