diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:50 +0000 |
commit | 68d3f33d5194c446812d09f079749ddf56f95378 (patch) | |
tree | 9cb521544bf72e420a2986ca2fba512274a020eb /config/gitlab.yml.example | |
parent | 6a4ffad42050949fcf08e78147575734ae99627e (diff) | |
download | gitlab-ce-68d3f33d5194c446812d09f079749ddf56f95378.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a5486e450d4..711fd4ef3c2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -321,8 +321,8 @@ production: &base # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages # File that contains the shared secret key for verifying access for gitlab-pages. - # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret + # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_pages_secret ## Mattermost ## For enabling Add to Mattermost button |