Commit 0fa2d167 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ash.mckenzie/allow-auth-via-jwt' into 'master'

Allow auth via JWT (always false in CE)

See merge request gitlab-org/gitlab-ce!21038
parents 9d942958 b2103cb4
...@@ -233,6 +233,8 @@ module Gitlab ...@@ -233,6 +233,8 @@ module Gitlab
end end
elsif user elsif user
# User access is verified in check_change_access! # User access is verified in check_change_access!
elsif authed_via_jwt?
# Authenticated via JWT
else else
raise UnauthorizedError, ERROR_MESSAGES[:upload] raise UnauthorizedError, ERROR_MESSAGES[:upload]
end end
...@@ -321,6 +323,10 @@ module Gitlab ...@@ -321,6 +323,10 @@ module Gitlab
!Gitlab.config.gitlab_shell.receive_pack !Gitlab.config.gitlab_shell.receive_pack
end end
def authed_via_jwt?
false
end
protected protected
def changes_list def changes_list
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment