Skip to content
Snippets Groups Projects
Commit 97b76850 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'workhorse-deprecate-gitaly-address' into 'master'

Remove deprecated field from workhorse API responses

See merge request !13567
parents 5cfc2686 4405c8e3
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment