diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
| commit | f3a4d57be14b40d1e3a6ad9e1a1f9337dafc872e (patch) | |
| tree | 623c4b710fed94a7280587da7d66863ab489957c /app/models/account_filter.rb | |
| parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
| parent | f847f67410c75036edb2c4b45d0db048af0481c9 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
Diffstat (limited to 'app/models/account_filter.rb')
| -rw-r--r-- | app/models/account_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index 3a4ac0492..d27bb46fc 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -81,7 +81,7 @@ class AccountFilter when 'suspended' Account.suspended when 'disabled' - accounts_with_users.merge(User.disabled) + accounts_with_users.merge(User.disabled).without_suspended when 'silenced' Account.silenced when 'sensitized' |