diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-09-15 14:37:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 14:37:58 +0200 |
| commit | ed099d8bdc5b3d9e7df7ce5358441887e6bb7e48 (patch) | |
| tree | e55ddfa97c0c9932e35c8ffd7cb59434084bd478 /app/models/user.rb | |
| parent | bbcbf12215a5ec69362a769c1bae9c630eda0ed4 (diff) | |
Change account suspensions to be reversible by default (#14726)
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index dbee08988..6b21d6ed6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -168,7 +168,7 @@ class User < ApplicationRecord end def active_for_authentication? - true + !account.memorial? end def suspicious_sign_in?(ip) @@ -176,7 +176,7 @@ class User < ApplicationRecord end def functional? - confirmed? && approved? && !disabled? && !account.suspended? && account.moved_to_account_id.nil? + confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil? end def unconfirmed_or_pending? |