diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-06 17:25:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 17:25:54 +0200 |
| commit | 8400ddca7155005ab79485ed6054c04ea3ca5667 (patch) | |
| tree | 696f5ae9a70891e96fdf819905b05aa6482bcf07 /app/helpers | |
| parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
| parent | d10f6036cfeebec5b2c160db8659d2c19d29fe9c (diff) | |
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/admin/filter_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 0bda25974..506429e10 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -5,15 +5,16 @@ module Admin::FilterHelper 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 - TAGS_FILTERS = %i(hidden).freeze + TAGS_FILTERS = %i(context review).freeze INSTANCES_FILTERS = %i(limited by_domain).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 def filter_link_to(text, link_to_params, link_class_params = link_to_params) - new_url = filtered_url_for(link_to_params) + new_url = filtered_url_for(link_to_params) new_class = filtered_url_for(link_class_params) + link_to text, new_url, class: filter_link_class(new_class) end |