Merge branch 'workhorse-1.4.3' into 'master'

Workhorse 1.4.3

Closes gitaly#167 and gitaly#177

See merge request !10479

1 files changed, 1 insertions, 6 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