aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-09 15:35:37 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-09 15:35:37 +0000
commit773b869088f341005ba1f01fc5ec1185665f15f1 (patch)
tree7ebdf757c2c164c9d45a97e1d861632a7a995448
parent5c48a89a7f6f42391522a9ddaacee52a1843db5f (diff)
downloadrails-773b869088f341005ba1f01fc5ec1185665f15f1.tar.gz
rails-773b869088f341005ba1f01fc5ec1185665f15f1.tar.bz2
rails-773b869088f341005ba1f01fc5ec1185665f15f1.zip
Another word on precedence (closes #2790)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/environments/environment.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index dee175ce39..fe987e244f 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -8,6 +8,8 @@
require File.join(File.dirname(__FILE__), 'boot')
Rails::Initializer.run do |config|
+ # Settings in config/environments/* take precedence those specified here
+
# Skip frameworks you're not going to use
# config.frameworks -= [ :action_web_service, :action_mailer ]