diff options
Diffstat (limited to 'www/gitlab/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 45a8c89d5209..15a9fb52c93c 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2024-04-17 11:47:15 UTC +--- config/gitlab.yml.example.orig 2024-05-15 08:00:50 UTC +++ config/gitlab.yml.example @@ -463,7 +463,7 @@ production: &base ## GitLab Pages @@ -22,7 +22,7 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1209,13 +1209,13 @@ production: &base +@@ -1200,13 +1200,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +38,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 -@@ -1250,12 +1250,12 @@ production: &base +@@ -1241,12 +1241,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +54,7 @@ # Git over HTTP upload_pack: true -@@ -1270,13 +1270,13 @@ production: &base +@@ -1261,13 +1261,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). @@ -70,7 +70,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1300,13 +1300,13 @@ production: &base +@@ -1291,13 +1291,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -86,7 +86,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1327,18 +1327,18 @@ production: &base +@@ -1318,18 +1318,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -112,7 +112,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1565,13 +1565,13 @@ test: +@@ -1556,13 +1556,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |