summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Lopez <fjlopez@gitlab.com>2017-11-10 20:14:35 +0100
committerFrancisco Lopez <fjlopez@gitlab.com>2017-11-17 10:02:11 +0100
commit98f7982ceccd6f7996774911632943e9f43df6e3 (patch)
treee939d2507ea7a147d68c84a7b5b7278b35124582
parent29521a313acc03eac0f81058a559fb4ca176f9e7 (diff)
downloadgitlab-ce-98f7982ceccd6f7996774911632943e9f43df6e3.tar.gz
Leaving atom? query to fix tests
-rw-r--r--lib/gitlab/auth/user_auth_finders.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/user_auth_finders.rb b/lib/gitlab/auth/user_auth_finders.rb
index b2fb24a4590..06b934fa042 100644
--- a/lib/gitlab/auth/user_auth_finders.rb
+++ b/lib/gitlab/auth/user_auth_finders.rb
@@ -10,7 +10,7 @@ module Gitlab
end
def find_user_from_rss_token
- return unless current_request.path.ends_with?('.atom')
+ return unless current_request.path.ends_with?('.atom') || current_request.format.atom?
token = current_request.params[:rss_token].presence
return unless token