diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-09-06 19:09:19 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-09-06 19:09:19 +0000 |
| commit | aca0bebe8b62e7acbe86fecbd9557e7c3b805506 (patch) | |
| tree | 2e7cb0dd68cb281245dbeb947b80f3f3302c7284 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Update devel/gitaly to 0.117.2 which is required for gitlab-ce 11.2.x. (diff) | |
Update www/gitlab-ce to 11.2.3.
For a detailed changelog please see here:
https://about.gitlab.com/2018/08/22/gitlab-11-2-released/
https://about.gitlab.com/2018/08/23/gitlab-11-2-1-released/
https://about.gitlab.com/2018/08/28/security-release-gitlab-11-dot-2-dot-2-released/
Approved by: mentors (implicit)
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 58721ec11848..99b75ea196d0 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 2018-06-21 15:14:17 UTC +--- config/gitlab.yml.example.orig 2018-08-22 22:40:32 UTC +++ config/gitlab.yml.example -@@ -218,7 +218,7 @@ production: &base +@@ -223,7 +223,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 -@@ -577,7 +577,7 @@ production: &base +@@ -582,7 +582,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,7 +18,7 @@ # Default Gitaly authentication token. Can be overriden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -595,8 +595,8 @@ production: &base +@@ -600,8 +600,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 -@@ -624,12 +624,12 @@ production: &base +@@ -629,12 +629,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -650,7 +650,7 @@ production: &base +@@ -655,7 +655,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |