diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-14 22:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 22:11:56 +0100 |
| commit | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch) | |
| tree | 74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/helpers/admin | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff) | |
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/admin')
| -rw-r--r-- | app/helpers/admin/filter_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 275b5f2fe..8f78bf5f8 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Admin::FilterHelper - ACCOUNT_FILTERS = %i(local remote by_domain active silenced suspended username display_name email ip staff).freeze + ACCOUNT_FILTERS = %i(local remote by_domain active pending silenced suspended username display_name email ip staff).freeze REPORT_FILTERS = %i(resolved account_id target_account_id).freeze INVITE_FILTER = %i(available expired).freeze CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze |