Merge remote-tracking branch 'parent/main' into upstream-20240918
This commit is contained in:
commit
4ce35dd837
188 changed files with 1994 additions and 980 deletions
|
@ -74,7 +74,7 @@ class Admin::AccountAction
|
|||
end
|
||||
|
||||
def disabled_types_for_account(account)
|
||||
if account.suspended?
|
||||
if account.suspended_locally?
|
||||
%w(silence suspend)
|
||||
elsif account.silenced?
|
||||
%w(silence)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue