diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
tree | a329d65c115e752c3be5c262ebf96f69cd13861a /app/models/user.rb | |
parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a1a278004..ec39ea50d 100644 --- 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 |