diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-05 16:00:05 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-05 16:00:05 +0300 |
| commit | 5ae8e3787afa309d4e563a3c17804ede828f7a5a (patch) | |
| tree | cd992e3270fde68471b7631f110eacb293ea4652 /app/controllers | |
| parent | 1fe7a42afca83fbbda638d9569d58a87039cd8f2 (diff) | |
| parent | d57fea4f2d394d879024b7a2ff3533f89f025e9f (diff) | |
Merge branch 'backport_from_EE' into 'master'
Minor backport from EE
See merge request gitlab-org/gitlab-ce!14705
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 4223c6171a6..ada91694fd6 100644 --- a/app/controllers/sessions_controller.rb +++ b/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 |