Merge remote-tracking branch 'upstream/pull/3832'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index f5638e233025c9f9217df674cb1e0c0ffdb4b133..22c130c99e566974480b801a639b20c0a0594f87 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
 require_relative "boot"
 
-if ENV["OPENSTREETMAP_STATUS"] == "database_offline"
+if ENV.fetch("OPENSTREETMAP_STATUS", nil) == "database_offline"
   require "active_model/railtie"
   require "active_job/railtie"
   require "active_storage/engine"
@@ -21,7 +21,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -35,10 +35,6 @@ module OpenStreetMap
     # This has defaulted to false since rails 6.0
     config.action_view.default_enforce_utf8 = true
 
-    # This defaults to true from rails 5.0 but our code doesn't comply
-    # with it at all so we turn it off
-    config.active_record.belongs_to_required_by_default = false unless Settings.status == "database_offline"
-
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types