Merge branch 'workhorse-1.4.3' into 'master'

Workhorse 1.4.3

Closes gitaly#167 and gitaly#177

See merge request !10479

GITLAB_WORKHORSE_VERSION

-1.4.2
+1.4.3

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

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