Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 14 insertions, 11 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index c816f03e3..9657d8f11 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,16 +1,19 @@
 # Settings specified here will take precedence over those in config/environment.rb
+RedmineApp::Application.configure do
+  # 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.
+  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 webserver when you make code changes.
-config.cache_classes     = false
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils        = true
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils        = true
+  # Show full error reports and disable caching
+  #config.action_controller.consider_all_requests_local = true
+  config.action_controller.perform_caching             = false
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+  # 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.active_support.deprecation = :log
+end