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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-31 22:42:17 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-05-10 00:31:37 +0300
commit802fcd051fcbc9be99230bddb13c4a7cb8067741 (patch)
tree9cadf6f58acc76b0a882980d7c3909ddeeac429c /app/controllers/sessions_controller.rb
parentb66be0a2b3351dd10d96e3d0d0576f6d1444f342 (diff)
Add support for backup codes
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 68cd02b2d79..cc9d30d64d5 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -44,7 +44,8 @@ class SessionsController < Devise::SessionsController
@user = User.by_login(user_params[:login])
if user_params[:otp_attempt].present?
- unless @user.valid_otp?(user_params[:otp_attempt])
+ unless @user.valid_otp?(user_params[:otp_attempt]) ||
+ @user.recovery_code?(user_params[:otp_attempt])
@error = 'Invalid two-factor code'
render :two_factor and return
end