diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 18:46:50 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 18:46:50 +0800 |
| commit | e1bc7577a4b83f729fae02c1fbdac9d066c93a51 (patch) | |
| tree | 9281ff73ddc53ecbe91d71c987ac0adca5939fb5 /config | |
| parent | d6c454572199eea8773f520b93a1260ab40baca7 (diff) | |
| parent | 59f81b4ff80862fb7649eba461ba588d6cfee9ec (diff) | |
| download | gitlab-ce-e1bc7577a4b83f729fae02c1fbdac9d066c93a51.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master:
Setup and run a Gitaly server for testing if GitalyClient is enabled
Update changelog with MR id
Move permission to create subgroup into GroupPolicy
Fix issue's note cache expiration after delete
fix(subgroups): add verification of group creation capability to subgroup UI
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: |