diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-01 11:25:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-01 11:25:51 +0000 |
| commit | b6e69673fdb9083f3e57a5ce0bbd101e603d21c1 (patch) | |
| tree | 6151e3768649c77ac45fc0bb77cda8d0b0972dc3 /lib | |
| parent | 466b7763236ca22ea87540063a10545467fa77b7 (diff) | |
| parent | 527f87dfdb16b3ef3aa772002667a6f5c1acce48 (diff) | |
| download | gitlab-ce-b6e69673fdb9083f3e57a5ce0bbd101e603d21c1.tar.gz | |
Merge branch 'backport-workhorse-show-all-refs' into 'master'
Support show-all-refs for git over HTTP
See merge request gitlab-org/gitlab-ce!14834
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 58d5b0da1c4..e1219df1b25 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -16,14 +16,15 @@ module Gitlab SECRET_LENGTH = 32 class << self - def git_http_ok(repository, is_wiki, user, action) + def git_http_ok(repository, is_wiki, user, action, show_all_refs: false) project = repository.project repo_path = repository.path_to_repo params = { GL_ID: Gitlab::GlId.gl_id(user), GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki), GL_USERNAME: user&.username, - RepoPath: repo_path + RepoPath: repo_path, + ShowAllRefs: show_all_refs } server = { address: Gitlab::GitalyClient.address(project.repository_storage), |