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

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.

db/migrate/20230129023109_add_template_to_webhooks.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTemplateToWebhooks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :webhooks, :template, :text
+  end
+end

db/migrate/20230605085710_add_exclusive_to_lists.rb

@@ -1,7 +1,17 @@
 # frozen_string_literal: true
 
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
 class AddExclusiveToLists < ActiveRecord::Migration[6.1]
-  def change
-    add_column :lists, :exclusive, :boolean, null: false, default: false
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :lists, :exclusive, :boolean, default: false, allow_null: false }
+  end
+
+  def down
+    remove_column :lists, :exclusive
   end
 end

db/schema.rb

@@ -567,7 +567,7 @@ ActiveRecord::Schema.define(version: 2023_06_05_085710) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "replies_policy", default: 0, null: false
-    t.boolean "exclusive", default: false
+    t.boolean "exclusive", default: false, null: false
     t.index ["account_id"], name: "index_lists_on_account_id"
   end
 
@@ -1139,6 +1139,7 @@ ActiveRecord::Schema.define(version: 2023_06_05_085710) do
     t.boolean "enabled", default: true, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.text "template"
     t.index ["url"], name: "index_webhooks_on_url", unique: true
   end