diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
| commit | b28b405b9763a0bb3df653b51e6d084b42e9a54d (patch) | |
| tree | c69f1ccb99440fea8cc94014e77687238e205160 /app/controllers/auth/sessions_controller.rb | |
| parent | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff) | |
| parent | dc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/auth/sessions_controller.rb')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 463a183e4..a5acb6c36 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -62,7 +62,7 @@ class Auth::SessionsController < Devise::SessionsController if user_params[:otp_attempt].present? && session[:otp_user_id] authenticate_with_two_factor_via_otp(user) - elsif user && user.valid_password?(user_params[:password]) + elsif user&.valid_password?(user_params[:password]) prompt_for_two_factor(user) end end |