diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-09-11 22:35:10 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-09-11 22:35:10 +0000 |
commit | eef1a7fe2c0964e0b507e3d7e557fc437570454c (patch) | |
tree | 6a1e5fdfb8014e68d75d6fca2a612d0824deff96 /lib/gitlab/auth/request_authenticator.rb | |
parent | 6c89bc7eae70ad9a63c4014d6457a80c18412fe5 (diff) | |
parent | 3c2b4a1cede956d5160ccf08d0a561bf31248161 (diff) | |
download | gitlab-ce-eef1a7fe2c0964e0b507e3d7e557fc437570454c.tar.gz |
Merge branch 'static-objects-external-storage' into 'master'
Enable serving static objects from an external storage
See merge request gitlab-org/gitlab-ce!31025
Diffstat (limited to 'lib/gitlab/auth/request_authenticator.rb')
-rw-r--r-- | lib/gitlab/auth/request_authenticator.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/auth/request_authenticator.rb b/lib/gitlab/auth/request_authenticator.rb index 176766d1a8b..aca8804b04c 100644 --- a/lib/gitlab/auth/request_authenticator.rb +++ b/lib/gitlab/auth/request_authenticator.rb @@ -24,7 +24,9 @@ module Gitlab end def find_sessionless_user(request_format) - find_user_from_web_access_token(request_format) || find_user_from_feed_token(request_format) + find_user_from_web_access_token(request_format) || + find_user_from_feed_token(request_format) || + find_user_from_static_object_token(request_format) rescue Gitlab::Auth::AuthenticationError nil end |