diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-12 09:25:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-12 09:25:09 +0000 |
| commit | c43f7d4713a719d7090d7ec5fbe4a36d233282ad (patch) | |
| tree | 7a74a7669a0ed8c84af7dfea532c5e1b79775513 /config | |
| parent | 3842b654030cfbc590936f0836b3c380aebf4442 (diff) | |
| parent | d6cc8feb6ce0a8e39a1bc8830b932155713357da (diff) | |
| download | gitlab-ce-c43f7d4713a719d7090d7ec5fbe4a36d233282ad.tar.gz | |
Merge branch 'gitaly-testing' into 'master'
Setup and run a Gitaly server for testing if GitalyClient is enabled
See merge request !10298
Diffstat (limited to 'config')
| -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 3c70f35b9d0..06c9f734c2a 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -579,9 +579,9 @@ test: storages: default: path: tmp/tests/repositories/ - gitaly_address: unix:<%= Rails.root.join('tmp/sockets/private/gitaly.socket') %> + gitaly_address: unix:tmp/tests/gitaly/gitaly.socket gitaly: - enabled: false + enabled: true backup: path: tmp/tests/backups gitlab_shell: |