diff options
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 7 | ||||
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 9df886c42a1..428b770e3e2 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -1.4.2 +1.4.3 diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 08011301d3c..a8a7bf9bc12 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -45,12 +45,7 @@ module Gitlab raise "Unsupported action: #{action}" end - 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 + params[:GitalyAddress] = address if feature_enabled end params diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index 9fbcb1fee69..b703e9808a8 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -188,10 +188,8 @@ describe Gitlab::Workhorse, lib: true do context 'when Gitaly is enabled' do let(:gitaly_params) do - address = Gitlab::GitalyClient.get_address('default') { - GitalySocketPath: URI(address).path, - GitalyAddress: address, + GitalyAddress: Gitlab::GitalyClient.get_address('default'), } end |