diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-12-31 11:46:56 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-12-31 11:57:59 -0800 |
| commit | a23f4b6aeed6b49f90f5c544c818798840f090b7 (patch) | |
| tree | dfbca46ff3d0ca62e781a36549fa57d08943db75 /railties | |
| parent | 1e41097294b6f966f65909db5c56c9fc21b665f7 (diff) | |
| download | rails-a23f4b6aeed6b49f90f5c544c818798840f090b7.tar.gz rails-a23f4b6aeed6b49f90f5c544c818798840f090b7.tar.bz2 rails-a23f4b6aeed6b49f90f5c544c818798840f090b7.zip | |
Add a /rails.rb for each framework for consistency
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails.rb | 10 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 9fb3cd9f94..68b451d813 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -1,8 +1,14 @@ require "rails/core" -%w(active_model active_record action_controller action_view action_mailer active_resource).each do |framework| +%w( + active_model + active_record + action_controller + action_view + action_mailer + active_resource +).each do |framework| begin - require framework require "#{framework}/rails" rescue LoadError end diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 221421855c..e4ecd2dcde 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -14,9 +14,11 @@ else end require 'rails' -# To skip frameworks you're not going to use, remove require "rails" and -# list the frameworks that you are going to use. +# To skip frameworks you're not going to use, change require "rails" +# to require "rails/core" and list the frameworks that you are going +# to use. # +# require "rails/core" # require "active_model/rails" # require "active_record/rails" # require "action_controller/rails" |