diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-04-04 16:41:50 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-04-04 16:41:50 +0300 |
| commit | ca94d20013b9f4480d0ba4d9fc831b6021877f03 (patch) | |
| tree | e09330177d0823aaad1604f7bac014e0102a1da2 /lib/gitlab | |
| parent | c5dae616c25960a1176f4fb75728a5a8ca22c75a (diff) | |
Pass GitalyAddress to workhorse
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index d0637f8b394..6f70c47c006 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -44,7 +44,12 @@ module Gitlab raise "Unsupported action: #{action}" end - params[:GitalySocketPath] = URI(address).path if feature_enabled + if feature_enabled + params[:GitalyAddress] = address + # TODO deprecate GitalySocketPath once GITLAB_WORKHORSE_VERSION points + # to a version that supports GitalyAddress. + params[:GitalySocketPath] = URI(address).path + end end params |