diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 2 |
2 files changed, 3 insertions, 1 deletions
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 |