Merge remote-tracking branch 'upstream/pull/2983' into master

[rails.git] / config / environments / development.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 49d2378704ba156e86b72a7c5b9c9e56fcc0b9a1..778e629eb49a987d1ac4620ffaaa9948e7ad0789 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,26 +1,68 @@
-OpenStreetMap::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.

 
   # In the development environment your application's code is reloaded on
 
   # In the development environment your application's code is reloaded on

-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.

   config.cache_classes = false
 
   config.cache_classes = false
 

-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false

 
 

-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true

 
 

-  # Don't care if the mailer can't send
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join("tmp/caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options).
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.

   config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.raise_delivery_errors = false
 

-  # Print deprecation notices to the Rails logger
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.

   config.active_support.deprecation = :log
 
   config.active_support.deprecation = :log
 

-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-end
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load unless Settings.status == "database_offline"
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true unless Settings.status == "database_offline"

 
 

+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+  # Export translations automatically.
+  config.middleware.use I18n::JS::Middleware
+
+  # Raises error for missing translations.
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Disable host validation.
+  config.hosts = []
+end