diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:30:31 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:30:31 +0300 |
| commit | 5c0d8d59ff676373659e4215067f3640604576e0 (patch) | |
| tree | 5fbb3df5e7f63eb23651f7898d75c0e6378590d4 /config/gitlab.yml.example | |
| parent | d40445e4c9964ae0ab793bfdd7ba530de4259716 (diff) | |
| parent | 78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4 (diff) | |
Merge branch 'gitaly-mandatory' into 'master'
Remove option to disable Gitaly in Rails
See merge request !12677
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 1eb209ac2be..75d03de18a1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -450,10 +450,6 @@ production: &base # Gitaly settings gitaly: - # This setting controls whether GitLab uses Gitaly (new component - # introduced in 9.0). Eventually Gitaly use will become mandatory and - # this option will disappear. - enabled: true # 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. |