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

2023-01-24 20:32:31 +01:00
parent 368d6fe54f a5a00d7f7a
commit 3074338d79
108 changed files with 1004 additions and 571 deletions
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -20,7 +20,7 @@ module Admin::ActionLogsHelper
    when 'Status'
      link_to log.human_identifier, log.permalink
    when 'AccountWarning'
-      link_to log.human_identifier, admin_account_path(log.target_id)
+      link_to log.human_identifier, disputes_strike_path(log.target_id)
    when 'Announcement'
      link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
    when 'IpBlock', 'Instance', 'CustomEmoji'