diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 22:39:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 22:39:35 +0100 |
| commit | a85912b0d6d2ee68aa35794fbb51c5358768c092 (patch) | |
| tree | af0dde21359576102ab8dcf8a1dc3342f67bb71c /app/models/account_filter.rb | |
| parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
| parent | 278bd61d6f507e56350e7f14caaeaa954700ecd8 (diff) | |
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 defd531ac..dcb174122 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -21,7 +21,7 @@ class AccountFilter end def results - scope = Account.includes(:account_stat, user: [:session_activations, :invite_request]).without_instance_actor.reorder(nil) + scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor.reorder(nil) params.each do |key, value| scope.merge!(scope_for(key, value.to_s.strip)) if value.present? |