consistent naming of FOSSGIS routers

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 3b470bacc5fc2759da6258fc3dd3badaffc26775..22c130c99e566974480b801a639b20c0a0594f87 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
 require_relative "boot"
 
 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"
   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.
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.

-    config.load_defaults 5.2
+    config.load_defaults 7.0

 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers


@@ -31,9 +31,9 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 

-    # 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"
+    # 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

 
     # 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,
 
     # 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,


@@ -46,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)
 
     # 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
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
       config.logstasher.enabled = true