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

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 01466ae751953845c603f9806ce45251003f5d54..778e629eb49a987d1ac4620ffaaa9948e7ad0789 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-OpenStreetMap::Application.configure do
+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
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on


@@ -9,35 +9,60 @@ OpenStreetMap::Application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
   # 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_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # 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
 
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 

+  config.action_mailer.perform_caching = false
+

   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.

-  unless STATUS == :database_offline
-    config.active_record.migration_error = :page_load
-  end
+  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
 
 
   # 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
 

-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true

 
 

-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Export translations automatically.
+  config.middleware.use I18n::JS::Middleware

 
 

-  # Raises error for missing translations
+  # Raises error for missing translations.

   # config.action_view.raise_on_missing_translations = true
   # 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
 end