X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/141df02e671d7c559f6d813bde1d792a159f1875..1a4f5aa7a1064747d6e154f4b1d03b73aa914834:/config/application.rb

diff --git a/config/application.rb b/config/application.rb
index a8a13c476..54390ba29 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,18 +1,5 @@
 require_relative "boot"
 
-# Guard against deployments with old-style application.yml configurations
-# Otherwise, admins might not be aware that they are now silently ignored
-# and major problems could occur
-# rubocop:disable Rails/Output, Rails/Exit
-if File.exist?(File.expand_path("application.yml", __dir__))
-  puts "The config/application.yml file is no longer supported"
-  puts "Default settings are now found in config/settings.yml and you can override these in config/settings.local.yml"
-  puts "To prevent unexpected behaviour, please copy any custom settings to config/settings.local.yml"
-  puts " and then remove your config/application.yml file."
-  exit!
-end
-# rubocop:enable Rails/Output, Rails/Exit
-
 if ENV["OPENSTREETMAP_STATUS"] == "database_offline"
   require "active_model/railtie"
   require "active_job/railtie"
@@ -34,7 +21,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -44,6 +31,13 @@ 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"
@@ -59,6 +53,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