Merged rails-3.2 branch.

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

3 files changed, 57 insertions, 52 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
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 91af89ce2..9ff88560d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,30 +1,32 @@
 # Settings specified here will take precedence over those in config/environment.rb
+RedmineApp::Application.configure do
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
 
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
+  #####
+  # Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
+  #
+  # Use a different logger for distributed setups
+  # config.logger        = SyslogLogger.new
+  #
+  # Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
+  # When setting a new Logger, make sure to set it's log level too.
+  #
+  # config.logger = Logger.new(config.log_path, 7, 1048576)
+  # config.logger.level = Logger::INFO
 
-#####
-# Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
-#
-# Use a different logger for distributed setups
-# config.logger        = SyslogLogger.new
-#
-# Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
-# When setting a new Logger, make sure to set it's log level too.
-#
-# config.logger = Logger.new(config.log_path, 7, 1048576)
-# config.logger.level = Logger::INFO
+  # Full error reports are disabled and caching is turned on
+  config.action_controller.perform_caching = true
 
-# Full error reports are disabled and caching is turned on
-config.action_controller.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"
 
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
+  # Disable delivery errors if you bad email addresses should just be ignored
+  config.action_mailer.raise_delivery_errors = false
 
-# Disable delivery errors if you bad email addresses should just be ignored
-config.action_mailer.raise_delivery_errors = false
+  # No email in production log
+  config.action_mailer.logger = nil
 
-# No email in production log
-config.action_mailer.logger = nil
+  config.active_support.deprecation = :log
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4ce45527a..39b4738b7 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,25 +1,25 @@
 # Settings specified here will take precedence over those in config/environment.rb
+RedmineApp::Application.configure do
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
 
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = true
+  # 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
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.delivery_method = :test
 
-config.action_mailer.perform_deliveries = true
-config.action_mailer.delivery_method = :test
+  # Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
+  config.action_controller.allow_forgery_protection = false
 
-config.action_controller.session = { 
-  :key => "_test_session",
-  :secret => "some secret phrase for the tests."
-}
+  config.active_support.deprecation = :log
 
-# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
-config.action_controller.allow_forgery_protection  = false
+  config.secret_token = 'a secret token for running the tests'
+end