diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-19 02:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 02:17:02 +0100 |
| commit | 79c57810b7fea1962c9746d74c90235ad4e3e899 (patch) | |
| tree | 6ec332dd20fa4ce8de954d8e260cce3f2dc67aee /app/policies/account_policy.rb | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | 5c966bef8b6aa116cfa2102e83e42d0fe421f3fc (diff) | |
Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/policies/account_policy.rb')
| -rw-r--r-- | app/policies/account_policy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb index 262ada42e..672e1786b 100644 --- a/app/policies/account_policy.rb +++ b/app/policies/account_policy.rb @@ -14,7 +14,7 @@ class AccountPolicy < ApplicationPolicy end def suspend? - staff? && !record.user&.staff? + staff? && !record.user&.staff? && !record.instance_actor? end def destroy? @@ -62,6 +62,6 @@ class AccountPolicy < ApplicationPolicy end def memorialize? - admin? && !record.user&.admin? + admin? && !record.user&.admin? && !record.instance_actor? end end |