diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-12-02 08:24:11 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-12-02 08:24:11 +0000 |
| commit | ae737d94ac10284738928109c11f43aeecca8a0b (patch) | |
| tree | ebe739f663d259e0f2aaf2e2f2984a8d0bc9cf1e /app/controllers/admin | |
| parent | 384a602fd4117a73338542c59985f54acf5fb3f8 (diff) | |
| parent | 4b85bf12ab7005a5a6b4472b8aeaf022ce042ad7 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/instances_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 5d57fe361..f155543ce 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -94,8 +94,8 @@ module Admin :local, :remote, :by_domain, + :active, :silenced, - :alphabetic, :suspended, :username, :display_name, diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb index 8ed0ea421..6f8eaf65c 100644 --- a/app/controllers/admin/instances_controller.rb +++ b/app/controllers/admin/instances_controller.rb @@ -31,7 +31,7 @@ module Admin end def subscribeable_accounts - Account.with_followers.remote.where(domain: params[:by_domain]) + Account.remote.where(protocol: :ostatus).where(domain: params[:by_domain]) end def filter_params |