Merge pull request #649 from kmycode/upstream-20240308

Upstream 20240308
2024-03-12 12:09:55 +09:00 · 2024-03-12 12:09:55 +09:00 · 8e7c66522e
commit 8e7c66522e
parent 287c560d66 08758a78e3
237 changed files with 6221 additions and 2253 deletions
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@ -743,7 +743,8 @@ into similar problems in the future (e.g. when new tables are created).

    private

-    # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L678-L684
+    # Private method copied from:
+    # https://github.com/rails/rails/blob/v7.1.3.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L974-L980
    def extract_foreign_key_action(specifier)
      case specifier
      when 'c'; :cascade