summaryrefslogtreecommitdiff
path: root/app/controllers/sessions_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-19 21:16:18 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-19 21:16:18 -0400
commit259851c0d601632ad02a9f6ac0d59276552570b9 (patch)
treeee51f875433e2df76f88a1ae8bad83225afe6400 /app/controllers/sessions_controller.rb
parent69723d20024821fb4206e899ffa3acd2da690315 (diff)
downloadgitlab-ce-259851c0d601632ad02a9f6ac0d59276552570b9.tar.gz
Bump devise-two-factor to 2.0.0rs-bump-two-factor
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index cfa565cd03e..1b60d3e27d0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -99,7 +99,7 @@ class SessionsController < Devise::SessionsController
end
def valid_otp_attempt?(user)
- user.valid_otp?(user_params[:otp_attempt]) ||
+ user.validate_and_consume_otp!(user_params[:otp_attempt]) ||
user.invalidate_otp_backup_code!(user_params[:otp_attempt])
end