diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-26 21:24:05 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-27 08:20:37 +0200 |
| commit | 46b95c05501c643fada4e953533f5eb9ff3caba6 (patch) | |
| tree | d2493f87dbea322a3489001bf02454e69fbcfd8a /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | www/gitlab-workhorse: Update to 14.4.0 (diff) | |
www/gitlab-ce: Update to 14.4.0
Changelog:
https://about.gitlab.com/releases/2021/10/22/gitlab-14-4-released/
I included the following patch to fix a problem with
sidekiq-cron gem version 1.2.0:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73093
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 6c9974f4a7df..943d15234fb2 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2021-10-01 16:06:26 UTC +--- config/gitlab.yml.example.orig 2021-10-21 22:00:37 UTC +++ config/gitlab.yml.example @@ -1128,14 +1128,14 @@ production: &base # real path not the symlink. @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1220,13 +1220,13 @@ production: &base +@@ -1223,13 +1223,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 -@@ -1453,13 +1453,13 @@ test: +@@ -1459,13 +1459,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |