diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
| commit | 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 (patch) | |
| tree | 09e7a5fef106da1b6ebdc53ac0df62cafc159520 /app/helpers | |
| parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
| parent | f85b66eb8cc9513822d0ece3928b12aa789bb410 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Diffstat (limited to 'app/helpers')
| -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 09a356296..4fd36ef42 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).freeze + FOLLOWERS_FILTERS = %i(relationship status by_domain activity).freeze FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS |