Skip redunant before_logout warden events

1 files changed, 1 insertions, 10 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fa7daa65c4a..3c9ad05ef86 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,6 +24,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :require_email, unless: :devise_controller?
 
+
   around_action :set_locale
 
   after_action :set_page_title_header, if: -> { request.format == :json }
@@ -127,13 +128,7 @@ class ApplicationController < ActionController::Base
   # Controllers such as GitHttpController may use alternative methods
   # (e.g. tokens) to authenticate the user, whereas Devise sets current_user.
   #
-  #  `current_user` call is going to trigger Warden::Proxy authentication
-  #  that is going to invoke warden callbacks, and we don't want to do it
-  #  twice in case of authentication request.
-  #
   def auth_user
-    return if authentication_request?
-
     if user_signed_in?
       current_user
     else
@@ -141,10 +136,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def authentication_request?
-    controller_name == 'sessions' && action_name == 'create'
-  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