diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-22 18:36:25 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-22 18:36:25 +0000 |
| commit | ac9f7fd6b88878ff4ca067b959dfe9f7f8231f62 (patch) | |
| tree | 911f778e428528c50301b97a7ea955e14b99141f /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Update to 8.35.0 which is required for gitlab 13.1. (diff) | |
Update to 13.1.
Changelog:
https://about.gitlab.com/releases/2020/06/22/gitlab-13-1-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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index a9730c2768fd..20a9108671a4 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 2020-05-21 17:04:27 UTC +--- config/gitlab.yml.example.orig 2020-06-19 16:45:52 UTC +++ config/gitlab.yml.example -@@ -961,7 +961,7 @@ production: &base +@@ -971,7 +971,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. -@@ -979,8 +979,8 @@ production: &base +@@ -989,8 +989,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 -@@ -1026,12 +1026,12 @@ production: &base +@@ -1036,12 +1036,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -1050,13 +1050,13 @@ production: &base +@@ -1060,13 +1060,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: |