diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-07-24 08:59:19 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-07-24 09:08:06 +0200 |
| commit | 3729fba860ebf1802b3883e7ca7e32ac9d35a210 (patch) | |
| tree | 26a5a00b3b6a8fd2adf06578a8a878f8ffc095df /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | www/gitlab-workhorse: Update to 14.1.0 (diff) | |
www/gitlab-ce: Update to 14.1.0
Changelog:
https://about.gitlab.com/releases/2021/07/22/gitlab-14-1-released/
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index c776e15ee016..e27690a87049 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 2021-06-21 15:55:09 UTC +--- config/gitlab.yml.example.orig 2021-07-21 12:00:21 UTC +++ config/gitlab.yml.example -@@ -1109,8 +1109,8 @@ production: &base +@@ -1114,8 +1114,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -11,7 +11,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -1156,12 +1156,12 @@ production: &base +@@ -1162,12 +1162,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -27,7 +27,7 @@ # Git over HTTP upload_pack: true -@@ -1176,13 +1176,13 @@ production: &base +@@ -1182,13 +1182,13 @@ production: &base 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). @@ -43,7 +43,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1192,13 +1192,13 @@ production: &base +@@ -1198,13 +1198,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -59,7 +59,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1425,7 +1425,7 @@ test: +@@ -1431,7 +1431,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |