diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 15:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 15:12:33 +0100 |
| commit | bb316faffff7a76bc89f7e942233f0e14caf60f5 (patch) | |
| tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/helpers/admin/filter_helper.rb | |
| parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
| parent | 050efbc12650feaac3e833c4dd740bf090e3dae1 (diff) | |
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/admin/filter_helper.rb')
| -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 4fd36ef42..0bda25974 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -7,7 +7,7 @@ module Admin::FilterHelper CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze TAGS_FILTERS = %i(hidden).freeze INSTANCES_FILTERS = %i(limited by_domain).freeze - FOLLOWERS_FILTERS = %i(relationship status by_domain activity).freeze + FOLLOWERS_FILTERS = %i(relationship status by_domain activity order).freeze FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS |