diff options
| author | James Lopez <james@gitlab.com> | 2018-03-07 17:52:29 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2018-03-07 17:52:29 +0300 |
| commit | 2fcf779cff589b2e47feb5ea8df8afeba10a6717 (patch) | |
| tree | 52024c190b073d003e588a98c1296aeac2cd5022 /app/controllers/concerns | |
| parent | 0f72475713dfdc5f89e2f5f8a8bbcc72f596e3f8 (diff) | |
| parent | 6deed66eda567d572c31bcbf5c6a3fcda8301cee (diff) | |
Merge branch 'sh-fix-otp-backup-cherry-pick' into 'master'
Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'master'
See merge request gitlab/gitlabhq!2349
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/authenticates_with_two_factor.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index db8c362f125..2753f83c3cf 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -56,6 +56,7 @@ module AuthenticatesWithTwoFactor session.delete(:otp_user_id) remember_me(user) if user_params[:remember_me] == '1' + user.save! sign_in(user) else user.increment_failed_attempts! |