Merge branch 'backport_from_EE' into 'master'

Minor backport from EE

See merge request gitlab-org/gitlab-ce!14705

app/controllers/sessions_controller.rb

@@ -13,7 +13,7 @@ class SessionsController < Devise::SessionsController
   before_action :auto_sign_in_with_provider, only: [:new]
   before_action :load_recaptcha
 
-  after_action :log_failed_login, only: [:new]
+  after_action :log_failed_login, only: [:new], if: :failed_login?
 
   def new
     set_minimum_password_length
@@ -46,8 +46,6 @@ class SessionsController < Devise::SessionsController
   private
 
   def log_failed_login
-    return unless failed_login?
-
     Gitlab::AppLogger.info("Failed Login: username=#{user_params[:login]} ip=#{request.remote_ip}")
   end