Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-03 04:17:11 +00:00
parent fa768abf5c 99f962ba73
commit 933840bebf
46 changed files with 1482 additions and 52 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -41,12 +41,15 @@ class User < ApplicationRecord

  ACTIVE_DURATION = 14.days

-  devise :registerable, :recoverable,
-         :rememberable, :trackable, :validatable, :confirmable,
-         :two_factor_authenticatable, :two_factor_backupable,
-         otp_secret_encryption_key: ENV['OTP_SECRET'],
+  devise :two_factor_authenticatable,
+         otp_secret_encryption_key: ENV['OTP_SECRET']
+
+  devise :two_factor_backupable,
         otp_number_of_backup_codes: 10

+  devise :registerable, :recoverable, :rememberable, :trackable, :validatable,
+         :confirmable
+
  belongs_to :account, inverse_of: :user, required: true
  belongs_to :invite, counter_cache: :uses
  accepts_nested_attributes_for :account