diff options
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" |