diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 11:38:44 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 11:38:44 +0200 |
| commit | 1b62b86fdd1ad98e680c534f05fb32ff6e23fca4 (patch) | |
| tree | c585b79f1a646588328b2c8f4741dea700783b89 /app/controllers/projects | |
| parent | 60e0137c864e26fee0120dc4447bb95acc46ce51 (diff) | |
| parent | 0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (diff) | |
| download | gitlab-ce-1b62b86fdd1ad98e680c534f05fb32ff6e23fca4.tar.gz | |
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/git_http_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb index 348d6cf4d96..f907d63258b 100644 --- a/app/controllers/projects/git_http_controller.rb +++ b/app/controllers/projects/git_http_controller.rb @@ -43,7 +43,7 @@ class Projects::GitHttpController < Projects::ApplicationController return if project && project.public? && upload_pack? authenticate_or_request_with_http_basic do |login, password| - auth_result = Gitlab::Auth.find(login, password, project: project, ip: request.ip) + auth_result = Gitlab::Auth.find_for_git_client(login, password, project: project, ip: request.ip) if auth_result.type == :ci && upload_pack? @ci = true |