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

2022-03-02 18:02:48 +01:00
parent 0b8fe020b5 462a6f7d72
commit 425a6c90c4
189 changed files with 2586 additions and 1444 deletions
--- a/app/controllers/admin/reports/actions_controller.rb
+++ b/app/controllers/admin/reports/actions_controller.rb
@ -7,7 +7,7 @@ class Admin::Reports::ActionsController < Admin::BaseController
    authorize @report, :show?

    case action_from_button
-    when 'delete'
+    when 'delete', 'mark_as_sensitive'
      status_batch_action = Admin::StatusBatchAction.new(
        type: action_from_button,
        status_ids: @report.status_ids,
@ -41,6 +41,8 @@ class Admin::Reports::ActionsController < Admin::BaseController
  def action_from_button
    if params[:delete]
      'delete'
+    elsif params[:mark_as_sensitive]
+      'mark_as_sensitive'
    elsif params[:silence]
      'silence'
    elsif params[:suspend]