diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-03-20 13:58:56 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-03-20 13:58:56 +0000 |
| commit | 4af19f5211fc4e9c03c5af6e086a305baf52b265 (patch) | |
| tree | 0ab2dc3f48f2439f982bb9b7e00171d6e755da9b /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Fix DEPENDS (diff) | |
Update to 11.8.2.
Changelog:
https://about.gitlab.com/2019/03/14/gitlab-11-8-2-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 e0b903a82809..5c9176a6f74a 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 2019-01-21 20:21:36 UTC +--- config/gitlab.yml.example.orig 2019-03-13 16:32:44 UTC +++ config/gitlab.yml.example -@@ -231,7 +231,7 @@ production: &base +@@ -248,7 +248,7 @@ production: &base # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages admin: @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -593,7 +593,7 @@ production: &base +@@ -610,7 +610,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,7 +18,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. -@@ -611,8 +611,8 @@ production: &base +@@ -628,8 +628,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -29,7 +29,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -640,12 +640,12 @@ production: &base +@@ -661,12 +661,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -666,7 +666,7 @@ production: &base +@@ -687,7 +687,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |