Merge remote-tracking branch 'parent/main' into upstream-20241216

app/models/admin/action_log.rb

@@ -5,15 +5,15 @@
 # Table name: admin_action_logs
 #
 #  id               :bigint(8)        not null, primary key
-#  account_id       :bigint(8)
 #  action           :string           default(""), not null
+#  human_identifier :string
+#  permalink        :string
+#  route_param      :string
 #  target_type      :string
-#  target_id        :bigint(8)
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
-#  human_identifier :string
-#  route_param      :string
-#  permalink        :string
+#  account_id       :bigint(8)        not null
+#  target_id        :bigint(8)
 #
 
 class Admin::ActionLog < ApplicationRecord

app/models/admin/action_log_filter.rb

@@ -59,6 +59,7 @@ class Admin::ActionLogFilter
     enable_relay: { target_type: 'Relay', action: 'enable' }.freeze,
     memorialize_account: { target_type: 'Account', action: 'memorialize' }.freeze,
     promote_user: { target_type: 'User', action: 'promote' }.freeze,
+    publish_terms_of_service: { target_type: 'TermsOfService', action: 'publish' }.freeze,
     remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze,
     reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
     resend_user: { target_type: 'User', action: 'resend' }.freeze,