diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-04 20:07:29 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-04 20:07:29 +0000 |
| commit | dffa6ca4c7942285ea3f2ae5472001f61b1feb96 (patch) | |
| tree | 1a9501436dfd7d9e118398924735386a6eb88b46 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Update xfce4-stopwatch-plugin to 0.4.0 (diff) | |
Update to gitlab-ce 13.0.5.
Changelog:
https://about.gitlab.com/releases/2020/05/06/gitlab-com-13-0-breaking-changes/
https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/
https://about.gitlab.com/releases/2020/06/03/critical-security-release-13-0-4-released/
Make sure you read the upgrade manual very carefully, there is a manual change in file:
/usr/local/share/gitaly/config.toml
required that the diff does not show.
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 32a9d738b793..a9730c2768fd 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-15 17:18:13 UTC +--- config/gitlab.yml.example.orig 2020-05-21 17:04:27 UTC +++ config/gitlab.yml.example -@@ -955,7 +955,7 @@ production: &base +@@ -961,7 +961,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. -@@ -973,8 +973,8 @@ production: &base +@@ -979,8 +979,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 -@@ -1020,12 +1020,12 @@ production: &base +@@ -1026,12 +1026,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -1044,13 +1044,13 @@ production: &base +@@ -1050,13 +1050,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: |