Merge branch 'main' into glitch-soc/merge-upstream

2021-11-06 00:15:38 +01:00
parent e0f3962697 6da135a493
commit 4bb6b1a1e7
24 changed files with 1097 additions and 825 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -64,7 +64,7 @@ class User < ApplicationRecord
  devise :two_factor_backupable,
         otp_number_of_backup_codes: 10

-  devise :registerable, :recoverable, :rememberable, :validatable,
+  devise :registerable, :recoverable, :validatable,
         :confirmable

  include Omniauthable