Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-03-07 18:54:57 +0300
committerRobert Speicher <rspeicher@gmail.com>2018-03-07 18:54:57 +0300
commit42725ea96c7c2804d8a08130de529aceb87129d1 (patch)
treea78271f92cf7f0266660fea06afde1144a27724f /app/controllers/concerns
parentd9ca76559f740bdeac78bcd9a7cfe60df5ef9795 (diff)
parent2fcf779cff589b2e47feb5ea8df8afeba10a6717 (diff)
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/authenticates_with_two_factor.rb1
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!