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 /lib/tasks | |
| 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 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index 3703f9cfb5c..7d35e0df53a 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -66,6 +66,7 @@ namespace :gitlab do config = { socket_path: address.sub(%r{\Aunix:}, ''), storage: storages } config[:auth] = { token: 'secret' } if Rails.env.test? config[:'gitaly-ruby'] = { dir: File.join(Dir.pwd, 'ruby') } if gitaly_ruby + config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } TOML.dump(config) end |