summaryrefslogtreecommitdiff
path: root/lib/gitlab/auth/request_authenticator.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/auth/request_authenticator.rb')
-rw-r--r--lib/gitlab/auth/request_authenticator.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth/request_authenticator.rb b/lib/gitlab/auth/request_authenticator.rb
index 123a39dea75..eb16701bad5 100644
--- a/lib/gitlab/auth/request_authenticator.rb
+++ b/lib/gitlab/auth/request_authenticator.rb
@@ -12,11 +12,11 @@ module Gitlab
end
def user
- find_sessionless_user || find_session_user
+ find_sessionless_user || find_user_from_warden
end
def find_sessionless_user
- find_user_by_private_token || find_user_by_rss_token || find_user_by_oauth_token
+ find_user_from_access_token || find_user_by_rss_token
end
end
end