diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-07 16:00:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-07 16:00:47 +0000 |
| commit | ff1fa39cd847f8311168684c4daa67472c509882 (patch) | |
| tree | 7826fd8a4fce4429a122efc1b039fb3378139786 /spec | |
| parent | 66e7b4cd07f3ad29765a4f60a4c13fc6a26c3575 (diff) | |
| parent | 4c68f22b0bf57b307abcef62e5f9ef927b1d047e (diff) | |
| download | gitlab-ce-ff1fa39cd847f8311168684c4daa67472c509882.tar.gz | |
Merge branch 'gitaly-386-shell-config' into 'master'
Gitaly needs to know where to find gitlab-shell
See merge request !13306
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index a2f4ec39d89..6d453c19fc3 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -105,6 +105,8 @@ describe 'gitlab:gitaly namespace rake task' do # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)} # This is in TOML format suitable for use in Gitaly's config.toml file. socket_path = "/path/to/my.socket" + [gitlab-shell] + dir = "#{Gitlab.config.gitlab_shell.path}" [[storage]] name = "default" path = "/path/to/default" |