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

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index d521b4a9cc9764fe909c003a558e8356f772d5fc..f5638e233025c9f9217df674cb1e0c0ffdb4b133 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,39 +1,13 @@
 require_relative "boot"
 
 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
-
-# Set the STATUS constant from the environment, if it matches a recognized value
-ALLOWED_STATUS = [
-  :online,            # online and operating normally
-  :api_readonly,      # site online but API in read-only mode
-  :api_offline,       # site online but API offline
-  :database_readonly, # database and site in read-only mode
-  :database_offline,  # database offline with site in emergency mode
-  :gpx_offline        # gpx storage offline
-].freeze
-
-status = if ENV["STATUS"] && ALLOWED_STATUS.include?(ENV["STATUS"].to_sym)
-           ENV["STATUS"].to_sym
-         else
-           :online
-         end
-Object.const_set("STATUS", status)
-
-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


@@ -47,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 6.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


@@ -57,21 +31,29 @@ 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]
 

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