summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-08 09:06:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-08 09:06:09 +0000
commit77a7772c3bdb03d92cbc154f6b1a762953cc7c19 (patch)
treeb841c2233afb01d1b6cc7dd4023f2b677ec19eb3 /config/gitlab.yml.example
parentf7234a0894db99c7ade3cf29c1b467aa4807cc41 (diff)
downloadgitlab-ce-77a7772c3bdb03d92cbc154f6b1a762953cc7c19.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 3b7abdfe17e..f2acfef80e9 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -319,8 +319,7 @@ production: &base
artifacts_server: true # Set to false if you want to disable online view of HTML artifacts
# 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:
- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
+
# 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