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

db/migrate/20240426000034_move_account_warning_notifications.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MoveAccountWarningNotifications < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class Notification < ApplicationRecord; end
+
+  def up
+    Notification.where(type: 'warning').in_batches.update_all(type: 'moderation_warning')
+  end
+
+  def down
+    Notification.where(type: 'moderation_warning').in_batches.update_all(type: 'warning')
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_04_01_222541) do
+ActiveRecord::Schema[7.1].define(version: 2024_04_26_000034) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"