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

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index cc7ef05005bc8156316c2f364afe5e366beeb6ea..22c130c99e566974480b801a639b20c0a0594f87 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,57 +1,61 @@
-require File.expand_path('../boot', __FILE__)
-
-require File.expand_path('../preinitializer', __FILE__)
-
-if STATUS == :database_offline
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-require "rails/test_unit/railtie"
+require_relative "boot"
+
+if ENV.fetch("OPENSTREETMAP_STATUS", nil) == "database_offline"
+  require "active_model/railtie"
+  require "active_job/railtie"
+  require "active_storage/engine"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "action_view/railtie"
+  require "action_cable/engine"
+  require "sprockets/railtie"
+  require "rails/test_unit/railtie"

 else
 else

-require 'rails/all'
+  require "rails/all"

 end
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 end
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)

 
 module OpenStreetMap
   class Application < Rails::Application
 
 module OpenStreetMap
   class Application < Rails::Application

-    # 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.
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 7.0

 
 

-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    # 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.

 
     # Custom directories with classes and modules you want to be autoloadable.
 
     # Custom directories with classes and modules you want to be autoloadable.

-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]

 
 

-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    # 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
 
     # 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

-    unless STATUS == :database_offline
-      config.active_record.schema_format = :sql
-    end
+    config.active_record.schema_format = :sql unless Settings.status == "database_offline"
+
+    # Don't eager load models when the database is offline
+    config.paths["app/models"].skip_eager_load! if Settings.status == "database_offline"

 
 

-    # Enable the asset pipeline
-    config.assets.enabled = true
+    # Use memcached for caching if required
+    config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)

 
 

-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # 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

 
 

-    # Don't eager load models when the database is offline
-    if STATUS == :database_offline
-      config.paths["app/models"].skip_eager_load!
+    # Use logstash for logging if required
+    if Settings.key?(:logstash_path)
+      config.logstasher.enabled = true
+      config.logstasher.suppress_app_log = false
+      config.logstasher.logger_path = Settings.logstash_path
+      config.logstasher.log_controller_parameters = true

     end
   end
 end
     end
   end
 end