diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-05-29 13:57:43 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-05-29 18:23:59 +0200 |
| commit | 6104340f64f758efc669a64f259acb598c1b1c54 (patch) | |
| tree | 75b27af939d5e9c5c8489a622456713bad6da9c1 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | www/gitlab-workhorse: Update to 13.12.0. (diff) | |
www/gitlab-ce: Update to 13.12.0.
Changelog:
https://about.gitlab.com/releases/2021/05/22/gitlab-13-12-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 6bc83c98d3fb..9a7bcfa31760 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-04-22 21:13:23 UTC +--- config/gitlab.yml.example.orig 2021-05-19 15:44:42 UTC +++ config/gitlab.yml.example -@@ -1084,7 +1084,7 @@ production: &base +@@ -1090,7 +1090,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +9,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -1102,8 +1102,8 @@ production: &base +@@ -1108,8 +1108,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +20,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -1149,12 +1149,12 @@ production: &base +@@ -1155,12 +1155,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -1169,13 +1169,13 @@ production: &base +@@ -1175,13 +1175,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). @@ -52,7 +52,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1185,13 +1185,13 @@ production: &base +@@ -1191,13 +1191,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: |