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

Merge branch 'workhorse-1.4.3' into 'master'

Workhorse 1.4.3

Closes gitaly#167 and gitaly#177

See merge request !10479
......@@ -45,12 +45,7 @@ def git_http_ok(repository, user, action)
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
......
......@@ -188,10 +188,8 @@ def call_verify(headers)
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
......
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