summaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-config_gitlab.yml.example
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2021-11-04 00:04:29 +0100
committerMatthias Fechner <mfechner@FreeBSD.org>2021-11-13 15:44:44 +0100
commiteca633b7381c632c8829d69f4ee83649c55c4b33 (patch)
treeef251205b8ba8d940e5b17a38a3c5c1c42c79ce3 /www/gitlab-ce/files/patch-config_gitlab.yml.example
parentNew ports required for previous rubygem updates (diff)
www/gitlab-ce: security upgrade to 14.4.1
This version has a problem showing files like .md files (e.g. README.md on the start page of a project). But as this bug is already present on version 14.4.0 I will deploy this now, to fix the security problems. We need to find the source why this happens and fix it later. Changelog: https://about.gitlab.com/releases/2021/10/28/security-release-gitlab-14-4-1-released/ Security: 33557582-3958-11ec-90ba-001b217b3468
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
-rw-r--r--www/gitlab-ce/files/patch-config_gitlab.yml.example12
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 943d15234fb2..367f017a1be4 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-10-21 22:00:37 UTC
+--- config/gitlab.yml.example.orig 2021-10-28 07:49:38 UTC
+++ config/gitlab.yml.example
-@@ -1128,14 +1128,14 @@ production: &base
+@@ -1130,14 +1130,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
-@@ -1184,12 +1184,12 @@ production: &base
+@@ -1186,12 +1186,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -34,7 +34,7 @@
# Git over HTTP
upload_pack: true
-@@ -1204,13 +1204,13 @@ production: &base
+@@ -1206,13 +1206,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
-@@ -1223,13 +1223,13 @@ production: &base
+@@ -1225,13 +1225,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
-@@ -1459,13 +1459,13 @@ test:
+@@ -1461,13 +1461,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly: