summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-08-15 16:39:31 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-08-15 16:39:31 +0200
commit4405c8e393c8621f1a5f3b31f6e7578419562716 (patch)
tree00c092541c050c751a9d26081f2163c077d47dbc
parentc19ea197c7195771ddd68fa298f72c28612cadd8 (diff)
downloadgitlab-ce-workhorse-deprecate-gitaly-address.tar.gz
Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-address
-rw-r--r--lib/gitlab/workhorse.rb1
-rw-r--r--spec/lib/gitlab/workhorse_spec.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 3f25e463412..a362a3a0bc6 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -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
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 654397ccffb..36ef1fbaa3f 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -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')