diff options
author | Ahmad Sherif <me@ahmadsherif.com> | 2016-12-26 19:15:40 +0200 |
---|---|---|
committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-01-18 19:43:17 +0200 |
commit | 0a1c8bb37cbfe550e7c29b8f30c607cf985466df (patch) | |
tree | 7686e1296ed4935bb8fc79e809411fd44aaa6bc9 /lib | |
parent | 4b43126d08972c201551fbd1fe42e85847d5e03f (diff) | |
download | gitlab-ce-0a1c8bb37cbfe550e7c29b8f30c607cf985466df.tar.gz |
Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/workhorse.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index d28bb583fe7..a3b502ffd6a 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -15,10 +15,17 @@ module Gitlab class << self def git_http_ok(repository, user) - { + params = { GL_ID: Gitlab::GlId.gl_id(user), RepoPath: repository.path_to_repo, } + + params.merge!( + GitalySocketPath: Gitlab.config.gitaly.socket_path, + GitalyResourcePath: "/projects/#{repository.project.id}/git-http/info-refs", + ) if Gitlab.config.gitaly.socket_path.present? + + params end def lfs_upload_ok(oid, size) |