X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7de3143525436a1c2fe9c484d0455ce6a702405a..f398c1e5eb35fa9e355544fb2860bc2ca9cfbe67:/config/application.rb diff --git a/config/application.rb b/config/application.rb index 7b576d38f..b801c8b5f 100644 --- 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" @@ -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