Commit 0cd09ba2 authored by James Lopez's avatar James Lopez

Resolve application controller conflict

parent 815afb28
...@@ -153,13 +153,6 @@ class ApplicationController < ActionController::Base ...@@ -153,13 +153,6 @@ class ApplicationController < ActionController::Base
end end
end end
# This filter handles personal access tokens, and atom requests with rss tokens
def authenticate_sessionless_user!
user = Gitlab::Auth::RequestAuthenticator.new(request).find_sessionless_user
sessionless_sign_in(user) if user
end
def verify_namespace_plan_check_enabled def verify_namespace_plan_check_enabled
render_404 unless Gitlab::CurrentSettings.should_check_namespace_plan? render_404 unless Gitlab::CurrentSettings.should_check_namespace_plan?
end end
......
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