diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-04 12:07:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-04 12:07:17 +0000 |
| commit | 27e18f182f7aab81fbe20e4b069e169a29c478ff (patch) | |
| tree | ed671dffa7a02eaed608a95d2db55771306c1474 /config | |
| parent | 22bb4872e657988bb8c133c515e8df4a0ad77785 (diff) | |
| parent | 147e2b21be180d4b405c6ebe861971cb0dc9e6b2 (diff) | |
| download | gitlab-ce-27e18f182f7aab81fbe20e4b069e169a29c478ff.tar.gz | |
Merge branch 'gitaly-fetch-ref' into 'master'
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c5c50c216e1..88771c5f5bb 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -499,6 +499,8 @@ production: &base # Gitaly settings gitaly: + # Path to the directory containing Gitaly client executables. + client_path: /home/git/gitaly # 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. @@ -664,7 +666,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/gitaly.socket gitaly: - enabled: true + client_path: tmp/tests/gitaly token: secret backup: path: tmp/tests/backups |