Merge branch 'workhorse-gitaly-repository' into 'master'

Pass Gitaly 'Repository' messages to workhorse for Git HTTP

Closes gitaly#148

See merge request !10343

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 6fe85af3c30..d1131ad65e0 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -17,14 +17,22 @@ module Gitlab
 
     class << self
       def git_http_ok(repository, user)
+        repo_path = repository.path_to_repo
         params = {
           GL_ID: Gitlab::GlId.gl_id(user),
-          RepoPath: repository.path_to_repo,
+          RepoPath: repo_path,
         }
 
         if Gitlab.config.gitaly.enabled
-          address = Gitlab::GitalyClient.get_address(repository.project.repository_storage)
+          storage = repository.project.repository_storage
+          address = Gitlab::GitalyClient.get_address(storage)
           params[:GitalySocketPath] = URI(address).path
+          # TODO: use GitalyClient code to assemble the Repository message
+          params[:Repository] = Gitaly::Repository.new(
+            path: repo_path,
+            storage_name: storage,
+            relative_path: Gitlab::RepoPath.strip_storage_path(repo_path),
+          ).to_h
         end
 
         params