Remove deprecated field from workhorse response

2 files changed, 2 insertions, 9 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 08011301d3c..a8a7bf9bc12 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -45,12 +45,7 @@ module Gitlab
                               raise "Unsupported action: #{action}"
                             end
 
-          if feature_enabled
-            params[:GitalyAddress] = address
-            # TODO deprecate GitalySocketPath once GITLAB_WORKHORSE_VERSION points
-            # to a version that supports GitalyAddress.
-            params[:GitalySocketPath] = URI(address).path
-          end
+          params[:GitalyAddress] = address if feature_enabled
         end
 
         params
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 9fbcb1fee69..b703e9808a8 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -188,10 +188,8 @@ describe Gitlab::Workhorse, lib: true do
 
     context 'when Gitaly is enabled' do
       let(:gitaly_params) do
-        address = Gitlab::GitalyClient.get_address('default')
         {
-          GitalySocketPath: URI(address).path,
-          GitalyAddress: address,
+          GitalyAddress: Gitlab::GitalyClient.get_address('default'),
         }
       end