diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index fedef1cb7416..f0f1142abbb8 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-12-21 14:06:23 UTC +--- config/gitlab.yml.example.orig 2022-01-21 10:23:10 UTC +++ config/gitlab.yml.example -@@ -1133,14 +1133,14 @@ production: &base +@@ -1139,14 +1139,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1189,12 +1189,12 @@ production: &base +@@ -1195,12 +1195,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -34,7 +34,7 @@ # Git over HTTP upload_pack: true -@@ -1209,13 +1209,13 @@ production: &base +@@ -1215,13 +1215,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). @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1228,13 +1228,13 @@ production: &base +@@ -1234,13 +1234,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -66,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1255,16 +1255,16 @@ production: &base +@@ -1261,16 +1261,16 @@ production: &base # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics sidekiq_exporter: @@ -91,7 +91,7 @@ # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics # It runs alongside the `/metrics` endpoints to ease the publish of metrics -@@ -1470,13 +1470,13 @@ test: +@@ -1488,13 +1488,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |