diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-09-22 17:35:03 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-09-23 21:42:07 +0200 |
| commit | fa814a6e9e3d770ffec356a07b3ed381a2e385b0 (patch) | |
| tree | 9c6d93ce7ee001da3ad923724bb578661c340c42 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | www/gitlab-workhorse: Update to 14.3.0 (diff) | |
www/gitlab-ce: Update to 14.3.0
Changelog:
https://about.gitlab.com/releases/2021/09/22/gitlab-14-3-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 89723cc9c122..fab515d68357 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-08-23 16:27:44 UTC +--- config/gitlab.yml.example.orig 2021-09-21 10:06:28 UTC +++ config/gitlab.yml.example -@@ -1123,8 +1123,8 @@ production: &base +@@ -1128,8 +1128,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 -@@ -1171,12 +1171,12 @@ production: &base +@@ -1184,12 +1184,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -27,7 +27,7 @@ # Git over HTTP upload_pack: true -@@ -1191,13 +1191,13 @@ production: &base +@@ -1204,13 +1204,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 -@@ -1207,13 +1207,13 @@ production: &base +@@ -1220,13 +1220,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 -@@ -1440,7 +1440,7 @@ test: +@@ -1453,7 +1453,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |