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

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

1 files changed, 9 insertions, 0 deletions

diff --git a/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb b/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb
new file mode 100644
index 000000000..73e6ad6f4
--- /dev/null
+++ b/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveActionTakenFromReports < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :reports, :action_taken, :boolean, default: false, null: false }
+  end
+end