Remove deprecated field from workhorse response

This commit is contained in:
Jacob Vosmaer 2017-04-05 15:57:23 +02:00
parent 90e0b2dfc4
commit 5077079faa
2 changed files with 2 additions and 9 deletions

View File

@ -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

View File

@ -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