X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1..e108ec6d48e4e2ec5f7c6451fde7328adcb1c7cd:/config/application.rb?ds=inline diff --git a/config/application.rb b/config/application.rb index a5431f09f..7b492aea0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,16 +1,6 @@ require_relative "boot" -require_relative "preinitializer" - -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. @@ -19,7 +9,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 7.0 # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers @@ -29,30 +19,28 @@ module OpenStreetMap # 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 + # 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, # 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, 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 - if defined?(LOGSTASH_PATH) + if Settings.key?(:logstash_path) 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 - - # Use DelayedJob as the persistent backend for ActiveJob - config.active_job.queue_adapter = :delayed_job end end