Add some new Rails 3 settings and tidy up environments files

3 files changed, 13 insertions, 8 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8b20aabf0..5b91c3271 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,9 +10,9 @@ Alaveteli::Application.configure do
   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
-  config.action_view.debug_rjs                         = true
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.action_view.debug_rjs = true
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0bb0db71a..ac4a2ccb6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -9,8 +9,8 @@ Alaveteli::Application.configure do
   # config.logger = SyslogLogger.new
 
   # Full error reports are disabled and caching is turned on
-  config.action_controller.consider_all_requests_local = false
-  config.action_controller.perform_caching             = true
+  config.consider_all_requests_local = false
+  config.action_controller.perform_caching = true
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host                  = "http://assets.example.com"
@@ -18,4 +18,6 @@ Alaveteli::Application.configure do
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
   config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
+
+  config.active_support.deprecation = :notify
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 315c0e576..c569af8cd 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,8 +13,8 @@ Alaveteli::Application.configure do
   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
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
 
   # Tell ActionMailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -22,5 +22,8 @@ Alaveteli::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
 end