Merge branch 'master' into redesign

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 75f8fee12ba8894deed7b87539c1502799bf5d3e..36696f8271c50b09f18ea2e3b56c2b546614abaf 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,37 +1,29 @@
 OpenStreetMap::Application.configure do
 OpenStreetMap::Application.configure do

-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.

 
   # 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 web server when you make code changes.
   config.cache_classes = false
 
 
   # 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 web server when you make code changes.
   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
+  # Show full error reports and disable caching.

   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 

-  # Don't care if the mailer can't send
+  # 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
+  # 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
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load

 
 

-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # 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
 end
   config.assets.debug = true
 end