Merged rails-4.1 branch (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 35 insertions, 36 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd66a784e..f7b15e140 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,19 +1,21 @@
-# Settings specified here will take precedence over those in config/application.rb
-RedmineApp::Application.configure do
+Rails.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
   # 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
+  config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils        = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
   # 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
 
-  # Don't care if the mailer can't send
+  # Disable delivery errors
   config.action_mailer.raise_delivery_errors = false
 
+  # Print deprecation notices to stderr and the Rails logger.
   config.active_support.deprecation = [:stderr, :log]
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ecb4cf902..85cd3890c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,33 +1,25 @@
-# Settings specified here will take precedence over those in config/application.rb
-RedmineApp::Application.configure do
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  #####
-  # Customize the default logger
-  # http://www.ruby-doc.org/stdlib-1.8.7/libdoc/logger/rdoc/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
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on
+  # Full error reports are disabled and caching is turned on.
+  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"
-
-  # Disable delivery errors if you bad email addresses should just be ignored
+  # Disable delivery errors
   config.action_mailer.raise_delivery_errors = false
 
   # No email in production log
   config.action_mailer.logger = nil
 
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f3d0ee9b8..249910443 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,16 +1,19 @@
-# Settings specified here will take precedence over those in config/application.rb
-RedmineApp::Application.configure do
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
   # 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
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
   # Show full error reports and disable caching
-  #config.action_controller.consider_all_requests_local = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
 
   config.action_mailer.perform_deliveries = true
@@ -20,10 +23,10 @@ RedmineApp::Application.configure do
   # ActionMailer::Base.deliveries array.
   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
+  # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Print deprecation notices to stderr and the Rails logger.
   config.active_support.deprecation = [:stderr, :log]
 
   config.secret_token = 'a secret token for running the tests'
diff --git a/config/environments/test_pgsql.rb b/config/environments/test_pgsql.rb
index 45cb09bdd..258914d20 100644
--- a/config/environments/test_pgsql.rb
+++ b/config/environments/test_pgsql.rb
@@ -1 +1,2 @@
+# Same as test.rb
 instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))
diff --git a/config/environments/test_sqlite3.rb b/config/environments/test_sqlite3.rb
index 45cb09bdd..258914d20 100644
--- a/config/environments/test_sqlite3.rb
+++ b/config/environments/test_sqlite3.rb
@@ -1 +1,2 @@
+# Same as test.rb
 instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))