Merge branch 'feature/support-grpc-calls-over-tcp-conn' into 'master'

Add support for Gitaly calls over TCP connection

Closes gitaly#166

See merge request !10410

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index a0dbe0a8c11..fe15fb12adb 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -12,9 +12,11 @@ module Gitlab
     end
 
     def self.new_channel(address)
-      # NOTE: Gitaly currently runs on a Unix socket, so permissions are
+      address = address.sub(%r{^tcp://}, '') if URI(address).scheme == 'tcp'
+      # NOTE: When Gitaly runs on a Unix socket, permissions are
       # handled using the file system and no additional authentication is
       # required (therefore the :this_channel_is_insecure flag)
+      # TODO: Add authentication support when Gitaly is running on a TCP socket.
       GRPC::Core::Channel.new(address, {}, :this_channel_is_insecure)
     end