Commit 97b76850 authored by Douwe Maan's avatar Douwe Maan

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

Remove deprecated field from workhorse API responses

See merge request !13567
parents 5cfc2686 4405c8e3
Pipeline #10888853 (#) failed with stages
in 82 minutes and 14 seconds
......@@ -45,7 +45,6 @@ module Gitlab
raise "Unsupported action: #{action}"
if feature_enabled
params[:GitalyAddress] = server[:address] # This field will be deprecated
params[:GitalyServer] = server
......@@ -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')
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