diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-15 15:56:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-15 15:56:02 +0000 |
| commit | 97b768508c360d2ae767a559b5037fe464061440 (patch) | |
| tree | be13f723129d091d52274cb4099687a2f54298ff | |
| parent | 5cfc26867fff4995d16b473d3826ecb338a3d952 (diff) | |
| parent | 4405c8e393c8621f1a5f3b31f6e7578419562716 (diff) | |
| download | gitlab-ce-97b768508c360d2ae767a559b5037fe464061440.tar.gz | |
Merge branch 'workhorse-deprecate-gitaly-address' into 'master'
Remove deprecated field from workhorse API responses
See merge request !13567
| -rw-r--r-- | lib/gitlab/workhorse.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 1 |
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 e78892d4232..b66afafa174 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') |