From 94e3e22eb8a7e22e68397b10f8fdeac99b0f540c Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Wed, 26 Apr 2006 19:29:35 +0000 Subject: Mention in docs that config.frameworks doesn't work when getting Rails via Gems. Closes #4857. [Alisdair McDiarmid] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4278 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 2 ++ railties/environments/environment.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9aa4969a6b..6e6ac8c30e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *1.1.2* (April 9th, 2005) +* Mention in docs that config.frameworks doesn't work when getting Rails via Gems. Closes #4857. [Alisdair McDiarmid] + * Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.] * Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [DHH] diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 1dbfbcb3cf..ae63a4aa39 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -13,7 +13,7 @@ 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 + # Skip frameworks you're not going to use (only works if using vendor/rails) # config.frameworks -= [ :action_web_service, :action_mailer ] # Add additional load paths for your own custom dirs -- cgit v1.2.3