diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-10 16:27:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-10 16:27:26 +0100 |
| commit | 82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0 (patch) | |
| tree | 0e6e0efcc6dc6ff1b517c82fb3b2a86cf78e8e4f /lib/gitlab/backend/grack_auth.rb | |
| parent | 5fd280f3d3264aec3656cb61cd8728f2ca4d61ce (diff) | |
| parent | 4e5897f51ef97d7c3ff6c57f81521f552979a3da (diff) | |
| download | gitlab-ce-82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0.tar.gz | |
Merge branch 'master' into copying-file-seen-as-licence
Diffstat (limited to 'lib/gitlab/backend/grack_auth.rb')
| -rw-r--r-- | lib/gitlab/backend/grack_auth.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index 440ef5a3cb3..0d156047ff0 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -33,6 +33,9 @@ module Grack auth! + lfs_response = Gitlab::Lfs::Router.new(project, @user, @request).try_call + return lfs_response unless lfs_response.nil? + if project && authorized_request? # Tell gitlab-workhorse the request is OK, and what the GL_ID is render_grack_auth_ok @@ -72,7 +75,7 @@ module Grack matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login) if project && matched_login.present? && git_cmd == 'git-upload-pack' - underscored_service = matched_login['s'].underscore + underscored_service = matched_login['s'].underscore if Service.available_services_names.include?(underscored_service) service_method = "#{underscored_service}_service" |