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

diff --git a/config/application.rb b/config/application.rb
index d521b4a9c..4517e8adf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,44 +1,6 @@
 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
-  require "action_controller/railtie"
-  require "action_mailer/railtie"
-  require "active_model/railtie"
-  require "sprockets/railtie"
-  require "rails/test_unit/railtie"
-else
-  require "rails/all"
-end
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -47,31 +9,35 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
-
-    # Settings in config/environments/* take precedence over those specified here.
-    # 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.
+    config.load_defaults 7.1
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W[#{config.root}/lib]
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(:ignore => %w[assets classic_pagination tasks])
 
-    # 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
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # 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
-
-    # Don't eager load models when the database is offline
-    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
+    config.active_record.schema_format = :sql unless 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)
 
+    # 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
+    # Enables custom error message formats
+    config.active_model.i18n_customize_full_message = true
+
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
       config.logstasher.enabled = true