Merge remote branch 'deployment/live' into live

[selectricity-live] / config / environments / development.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 198c2bdafe91f92df9e624308df375b3dec695b2..2d7f9789e0a4bf8cb1e9388defc71e218665520f 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,13 +9,9 @@ config.cache_classes = false
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true
 
-# Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
-
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 config.action_view.debug_rjs                         = true
 
 # Don't care if the mailer can't send