From 0db89d256c4c18393a1e1f67d3a1f2091deea618 Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Sat, 8 Mar 2025 11:57:30 +0800 Subject: [PATCH] Fix production run after go Rails 7.2 --- config/environments/production.rb | 5 ----- config/initializers/06-pending_migrations_check.rb | 2 +- docker/prod/wait_for_db.rb | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index a9095d98c0f..3bd98366516 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -164,11 +164,6 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - # Silence the following warning - # "Rails couldn't infer whether you are using multiple databases from your database.yml" - # This is deprecated in 7.1. and the warning got removed. - config.active_record.suppress_multiple_database_warning = true - if OpenProject::Configuration.enable_internal_assets_server? config.public_file_server.enabled = true config.public_file_server.headers = { diff --git a/config/initializers/06-pending_migrations_check.rb b/config/initializers/06-pending_migrations_check.rb index afb34290cee..04614b2822b 100644 --- a/config/initializers/06-pending_migrations_check.rb +++ b/config/initializers/06-pending_migrations_check.rb @@ -31,5 +31,5 @@ no_rake_task = !(Rake.respond_to?(:application) && Rake.application.top_level_ta no_override = ENV["OPENPROJECT_DISABLE__MIGRATIONS__CHECK"] != "true" if Rails.env.production? && !is_console && no_rake_task && no_override - ActiveRecord::Migration.check_pending! # will raise an exception and abort boot + ActiveRecord::Migration.check_all_pending! # will raise an exception and abort boot end diff --git a/docker/prod/wait_for_db.rb b/docker/prod/wait_for_db.rb index 4fc18e2afc1..9f6e8b5a11a 100644 --- a/docker/prod/wait_for_db.rb +++ b/docker/prod/wait_for_db.rb @@ -8,7 +8,7 @@ Timeout::timeout(timeout) do sleep 4 begin - ActiveRecord::Migration.check_pending! + ActiveRecord::Migration.check_all_pending! puts "[#{DateTime.now}] db ready" exit 0