Commit 78a84421 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'workhorse-1.4.3' into 'master'

Workhorse 1.4.3

Closes gitaly#167 and gitaly#177

See merge request !10479
parents 5c687e23 5077079f
...@@ -45,12 +45,7 @@ module Gitlab ...@@ -45,12 +45,7 @@ module Gitlab
raise "Unsupported action: #{action}" raise "Unsupported action: #{action}"
end end
if feature_enabled params[:GitalyAddress] = address 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 end
params params
......
...@@ -188,10 +188,8 @@ describe Gitlab::Workhorse, lib: true do ...@@ -188,10 +188,8 @@ describe Gitlab::Workhorse, lib: true do
context 'when Gitaly is enabled' do context 'when Gitaly is enabled' do
let(:gitaly_params) do let(:gitaly_params) do
address = Gitlab::GitalyClient.get_address('default')
{ {
GitalySocketPath: URI(address).path, GitalyAddress: Gitlab::GitalyClient.get_address('default'),
GitalyAddress: address,
} }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment