diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-28 02:23:33 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-10 00:31:07 +0300 |
| commit | 7302395142dc93a45239c993b69958ca4a757c92 (patch) | |
| tree | 17dfc5014de431462f05c13bec35f14b5b90550e /app/models/user.rb | |
| parent | fe75411df8d8ed41e89cfcae73d1ea34b8b339b9 (diff) | |
Init 2 factor authentication for user model
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1cf7cfea974..b9e28900187 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -57,6 +57,9 @@ require 'carrierwave/orm/activerecord' require 'file_size_validator' class User < ActiveRecord::Base + devise :two_factor_authenticatable, + :otp_secret_encryption_key => File.read(Rails.root.join('.secret')).chomp + include Sortable include Gitlab::ConfigHelper include TokenAuthenticatable @@ -70,7 +73,7 @@ class User < ActiveRecord::Base default_value_for :hide_no_password, false default_value_for :theme_id, gitlab_config.default_theme - devise :database_authenticatable, :lockable, :async, + devise :lockable, :async, :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :confirmable, :registerable attr_accessor :force_random_password |