diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-10-23 04:57:46 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-10-23 04:57:46 +0000 |
| commit | f44054fe1a4346adb0368cc45aaff36fe0366fe2 (patch) | |
| tree | 9f6876c30608474ccb8323b9e80be8bad9bee02e /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Update to 4.9.1 which is required for gitlab-ce 13.5. (diff) | |
Major upgrade to 13.5.0.
Changelog:
https://about.gitlab.com/releases/2020/10/22/gitlab-13-5-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 1914e9636bd1..5eec1c6ef941 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-09-21 16:23:36 UTC +--- config/gitlab.yml.example.orig 2020-10-21 18:16:04 UTC +++ config/gitlab.yml.example -@@ -1012,7 +1012,7 @@ production: &base +@@ -1044,7 +1044,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. -@@ -1030,8 +1030,8 @@ production: &base +@@ -1062,8 +1062,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 -@@ -1077,12 +1077,12 @@ production: &base +@@ -1109,12 +1109,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -1097,22 +1097,22 @@ production: &base +@@ -1129,22 +1129,22 @@ 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). |