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

2022-05-24 13:59:21 +02:00
parent c279dbd470 e5997a1956
commit 22111914bf
130 changed files with 2804 additions and 674 deletions
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -164,8 +164,8 @@ class Admin::AccountAction

  def reports
    @reports ||= begin
-      if type == 'none' && with_report?
-        [report]
+      if type == 'none'
+        with_report? ? [report] : []
      else
        Report.where(target_account: target_account).unresolved
      end