diff options
| author | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-11-15 16:19:09 +0200 |
|---|---|---|
| committer | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-11-15 16:19:09 +0200 |
| commit | 73b3da73d62b3b18b6552f2a99f86458d03d628a (patch) | |
| tree | ad65dac4757615ddb813f6152d4eb76ac14ebee4 /config/gitlab.yml.example | |
| parent | ebc174e968ece65110aa722a18cdf437cfa75eeb (diff) | |
| parent | bf31bd0d82affc29963d7d15c850ae0a0cc362a3 (diff) | |
| download | gitlab-ce-73b3da73d62b3b18b6552f2a99f86458d03d628a.tar.gz | |
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5390ea78e62..a59600763fb 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -207,6 +207,10 @@ production: &base # endpoint: 'http://127.0.0.1:9000' # default: nil # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + ## Packages (maven repository so far) + packages: + enabled: false + ## GitLab Pages pages: enabled: false @@ -587,7 +591,7 @@ production: &base gitaly: # Path to the directory containing Gitaly client executables. client_path: /home/git/gitaly/bin - # Default Gitaly authentication token. Can be overriden per storage. Can + # 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. token: |