Merge branch 'workhorse-deprecate-gitaly-address' into 'master'
Remove deprecated field from workhorse API responses See merge request !13567
This commit is contained in:
commit
97b768508c
|
@ -45,7 +45,6 @@ module Gitlab
|
|||
raise "Unsupported action: #{action}"
|
||||
end
|
||||
if feature_enabled
|
||||
params[:GitalyAddress] = server[:address] # This field will be deprecated
|
||||
params[:GitalyServer] = server
|
||||
end
|
||||
|
||||
|
|
|
@ -202,7 +202,6 @@ describe Gitlab::Workhorse do
|
|||
context 'when Gitaly is enabled' do
|
||||
let(:gitaly_params) do
|
||||
{
|
||||
GitalyAddress: Gitlab::GitalyClient.address('default'),
|
||||
GitalyServer: {
|
||||
address: Gitlab::GitalyClient.address('default'),
|
||||
token: Gitlab::GitalyClient.token('default')
|
||||
|
|
Loading…
Reference in New Issue