X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1739bf6832886c86b5bf111608982b10f1965c47..f398c1e5eb35fa9e355544fb2860bc2ca9cfbe67:/config/application.rb?ds=sidebyside

diff --git a/config/application.rb b/config/application.rb
index 651d32907..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"
@@ -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 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -31,17 +31,10 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
-    # Continue to use the classic autoloader for now
-    config.autoloader = :classic
-
     # Force requests from old versions of IE (<= IE8) to be UTF-8 encoded.
     # 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
@@ -53,6 +46,10 @@ module OpenStreetMap
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
 
+    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+    # the I18n.default_locale when a translation cannot be found).
+    config.i18n.fallbacks = true
+
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
       config.logstasher.enabled = true