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

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index b6e2ba46788c14d6342e934f31a0364b9e83c43c..f5638e233025c9f9217df674cb1e0c0ffdb4b133 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,11 +1,13 @@
 require_relative "boot"
 
 require_relative "boot"
 

-require_relative "preinitializer"
-
-if STATUS == :database_offline
+if ENV["OPENSTREETMAP_STATUS"] == "database_offline"
+  require "active_model/railtie"
+  require "active_job/railtie"
+  require "active_storage/engine"

   require "action_controller/railtie"
   require "action_mailer/railtie"
   require "action_controller/railtie"
   require "action_mailer/railtie"

-  require "active_model/railtie"
+  require "action_view/railtie"
+  require "action_cable/engine"

   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else
   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else


@@ -18,29 +20,45 @@ Bundler.require(*Rails.groups)
 
 module OpenStreetMap
   class Application < Rails::Application
 
 module OpenStreetMap
   class Application < Rails::Application

+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.0
+

     # Settings in config/environments/* take precedence over those specified here.
     # Settings in config/environments/* take precedence over those specified here.

-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.

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

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

-    config.active_record.schema_format = :sql unless STATUS == :database_offline
+    config.active_record.schema_format = :sql unless Settings.status == "database_offline"

 
     # Don't eager load models when the database is offline
 
     # Don't eager load models when the database is offline

-    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
+    config.paths["app/models"].skip_eager_load! if Settings.status == "database_offline"

 
     # Use memcached for caching if required
 
     # Use memcached for caching if required

-    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)
+    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
 
     # Use logstash for logging if required

-    if defined?(LOGSTASH_PATH)
+    if Settings.key?(:logstash_path)

       config.logstasher.enabled = true
       config.logstasher.suppress_app_log = false
       config.logstasher.enabled = true
       config.logstasher.suppress_app_log = false

-      config.logstasher.logger_path = LOGSTASH_PATH
+      config.logstasher.logger_path = Settings.logstash_path

       config.logstasher.log_controller_parameters = true
     end
   end
       config.logstasher.log_controller_parameters = true
     end
   end