From f14362f1b16084c2d6c4cd00b8f69101b9e3a060 Mon Sep 17 00:00:00 2001 From: Brian Austin Date: Fri, 1 Dec 2023 19:07:18 -0500 Subject: [PATCH 1/2] AO3-6639 Revert schema dump setting --- config/application.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/application.rb b/config/application.rb index 692c5754b0e..d645921512e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -66,6 +66,11 @@ class Application < Rails::Application # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:content, :password, :terms_of_service_non_production] + # Disable dumping schemas after migrations. + # This can cause problems since we don't always update versions on merge. + # Ideally this would be enabled in dev, but we're not quite ready for that. + config.active_record.dump_schema_after_migration = false + # Allows belongs_to associations to be optional config.active_record.belongs_to_required_by_default = false From 311b59bdcc48d1e3afadbfa365fd4e39bf62e15b Mon Sep 17 00:00:00 2001 From: Brian Austin Date: Fri, 1 Dec 2023 19:28:10 -0500 Subject: [PATCH 2/2] Update schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 1d41c73abab..d8e5cbf6ff5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1057,7 +1057,7 @@ create_table "skins", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", options: "ENGINE=InnoDB ROW_FORMAT=DYNAMIC", force: :cascade do |t| t.string "title" t.integer "author_id" - t.text "css" + t.text "css", size: :long t.boolean "public", default: false t.boolean "official", default: false t.datetime "created_at"