From 66bc758e2b9ba736035d036b25b17bdbb83c39b3 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 5 May 2015 22:16:09 -0400 Subject: [PATCH] Update User model for two-factor auth --- app/models/user.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index befbcbf1a16..7b1f6fae3be 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -73,8 +73,11 @@ class User < ActiveRecord::Base default_value_for :hide_no_password, false default_value_for :theme_id, gitlab_config.default_theme - devise :lockable, :async, - :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :confirmable, :registerable + devise :two_factor_authenticatable, + otp_secret_encryption_key: File.read(Rails.root.join('.secret')).chomp + devise :two_factor_backupable + devise :lockable, :async, :recoverable, :rememberable, :trackable, + :validatable, :omniauthable, :confirmable, :registerable attr_accessor :force_random_password @@ -663,4 +666,9 @@ class User < ActiveRecord::Base true end + + # Used to populate the hidden form field during Two-factor authentication + def login + username || email + end end