summaryrefslogtreecommitdiff
path: root/www/gitlab/files/patch-config_gitlab.yml.example
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab/files/patch-config_gitlab.yml.example')
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 0dcd9da7073a..3525fe458ecd 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2018-02-25 17:42:24 UTC
+--- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC
+++ config/gitlab.yml.example
-@@ -517,7 +517,7 @@ production: &base
+@@ -570,7 +570,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@@ -9,7 +9,7 @@
# Default Gitaly authentication token. Can be overriden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
-@@ -535,8 +535,8 @@ production: &base
+@@ -588,8 +588,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
-@@ -564,12 +564,12 @@ production: &base
+@@ -617,12 +617,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
-@@ -590,7 +590,7 @@ production: &base
+@@ -643,7 +643,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git: