Merge branch 'master' into notes

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 49d2378704ba156e86b72a7c5b9c9e56fcc0b9a1..5cb58cf132ffea439a5c23bb3b9dbd5433d81b61 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -2,8 +2,8 @@ OpenStreetMap::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

-  # 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
 
   # Log error messages when you accidentally call methods on nil.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.


@@ -11,7 +11,6 @@ OpenStreetMap::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
 
   # 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
 
   # Don't care if the mailer can't send
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send


@@ -22,5 +21,21 @@ OpenStreetMap::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin

-end

 
 

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