about summary refs log tree commit diff
path: root/app/models/admin
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-24 13:59:21 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-24 13:59:21 +0200
commit22111914bfc838a43bb2e20244c965467f127de2 (patch)
tree8f6301da32a36a3ebeec0b965a74f67c02632f7c /app/models/admin
parentc279dbd47082e908d98dc8cf869c0ff7fc19f1ae (diff)
parente5997a195602624efdb366e9f09ffa377e859580 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/admin')
-rw-r--r--app/models/admin/account_action.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 237975880..aed3bc0c7 100644
--- 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