Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
parent 430d442791 14f436c457
commit b3bf32a21e
59 changed files with 1219 additions and 598 deletions
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -13,6 +13,7 @@ module Admin::FilterHelper
    RelationshipFilter::KEYS,
    AnnouncementFilter::KEYS,
    Admin::ActionLogFilter::KEYS,
+    Admin::StatusFilter::KEYS,
  ].flatten.freeze

  def filter_link_to(text, link_to_params, link_class_params = link_to_params)