diff options
| author | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
| commit | fee3abd1dce8f437e3514cb03816ae50862b3c4c (patch) | |
| tree | 72e19e9e748edce7024737cfb70f9088346058bd /app/models/user.rb | |
| parent | 9148c3e8479e59df9f9a4889ef58a959f60f6606 (diff) | |
| parent | 08325db62bcc4d5d530513c615bc1c733f166239 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 72fc92195..1548e1ea0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -161,7 +161,11 @@ class User < ApplicationRecord end def active_for_authentication? - super && approved? + true + end + + def functional? + confirmed? && approved? && !disabled? && !account.suspended? end def inactive_message |