diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-03-23 17:47:37 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-03-23 17:47:37 +0000 |
| commit | 028916ec6172f0d980cb9c66bb24c4b1167008bf (patch) | |
| tree | 83db191e409a05eaca0e23eec7157280805ba256 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Upgrade to 8.7.1 which is required for gitlab 11.9. (diff) | |
Upgrade to 11.9.0.
Changelog:
https://about.gitlab.com/2019/03/22/gitlab-11-9-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 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 5c9176a6f74a..389b871ccce2 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2019-03-13 16:32:44 UTC +--- config/gitlab.yml.example.orig 2019-03-20 23:32:21 UTC +++ config/gitlab.yml.example @@ -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 @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -610,7 +610,7 @@ production: &base +@@ -645,7 +645,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. -@@ -628,8 +628,8 @@ production: &base +@@ -663,8 +663,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -29,23 +29,16 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -661,12 +661,12 @@ production: &base +@@ -696,7 +696,7 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ -- hooks_path: /home/git/gitlab-shell/hooks/ + path: %%PREFIX%%/share/gitlab-shell/ -+ hooks_path: %%PREFIX%%/share/gitlab-shell/hooks/ # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -- # secret_file: /home/git/gitlab/.gitlab_shell_secret -+ # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret - - # Git over HTTP - upload_pack: true -@@ -687,7 +687,7 @@ production: &base +@@ -721,7 +721,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |