summaryrefslogtreecommitdiff
path: root/lib/gitlab/workhorse.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-03-30 18:48:22 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-04-03 13:58:29 +0200
commit13487809c7fd9994f14babf3e189b434f61692ca (patch)
tree24a3087d3edaabd301d94883e7f17ceaba1355e2 /lib/gitlab/workhorse.rb
parent88812ce2bf689c65cfd72ff7f6f3537a5b19aafb (diff)
downloadgitlab-ce-13487809c7fd9994f14babf3e189b434f61692ca.tar.gz
Pass Gitaly Repository messages to workhorse
Diffstat (limited to 'lib/gitlab/workhorse.rb')
-rw-r--r--lib/gitlab/workhorse.rb12
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