about summary refs log tree commit diff
path: root/app/models/account_filter.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-13 18:17:16 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-13 18:17:16 +0000
commit82236a37039043d134efb3ddbdd2a3e04e714e2c (patch)
treec00cd712a172ac3d5865e94bc505590fa211ecd5 /app/models/account_filter.rb
parent65d083338debc256360fd6052ec43b98c442320c (diff)
parent72314d26aeef0b225401d3f0ad97ea948c66f423 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/account_filter.rb')
-rw-r--r--app/models/account_filter.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 189872368..dc7a03039 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -45,6 +45,8 @@ class AccountFilter
       else
         Account.default_scoped
       end
+    when 'staff'
+      accounts_with_users.merge User.staff
     else
       raise "Unknown filter: #{key}"
     end