Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.

db/migrate/20160826155805_add_superapp_to_oauth_applications.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddSuperappToOauthApplications < ActiveRecord::Migration[5.0]
+class AddSuperappToOAuthApplications < ActiveRecord::Migration[5.0]
   def change
     add_column :oauth_applications, :superapp, :boolean, default: false, null: false
   end

db/migrate/20170114203041_add_website_to_oauth_application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddWebsiteToOauthApplication < ActiveRecord::Migration[5.0]
+class AddWebsiteToOAuthApplication < ActiveRecord::Migration[5.0]
   def change
     add_column :oauth_applications, :website, :string
   end

db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLastUsedAtToOauthAccessTokens < ActiveRecord::Migration[6.1]
+class AddLastUsedAtToOAuthAccessTokens < ActiveRecord::Migration[6.1]
   def change
     safety_assured do
       change_table(:oauth_access_tokens, bulk: true) do |t|

db/migrate/20250328153843_create_instance_moderation_notes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateInstanceModerationNotes < ActiveRecord::Migration[8.0]
+  def change
+    create_table :instance_moderation_notes do |t|
+      t.string :domain, null: false
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }, index: false, null: false
+      t.text :content
+
+      t.timestamps
+
+      t.index ['domain'], name: 'index_instance_moderation_notes_on_domain'
+    end
+  end
+end