aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-12-31 12:28:48 -0800
committerCarl Lerche <carllerche@mac.com>2009-12-31 13:12:52 -0800
commite749424dfa38a0300a621b772eae96f9cc5d2555 (patch)
tree17300967fe0c5bbd245ddceeb3682b5781a436f1 /railties/lib/rails/generators
parentfdc62cdcdb70e13f2cf9e6dced35016716d889f9 (diff)
downloadrails-e749424dfa38a0300a621b772eae96f9cc5d2555.tar.gz
rails-e749424dfa38a0300a621b772eae96f9cc5d2555.tar.bz2
rails-e749424dfa38a0300a621b772eae96f9cc5d2555.zip
Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/boot.rb9
1 files changed, 4 insertions, 5 deletions
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 e4ecd2dcde..6051a8104f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -13,12 +13,11 @@ else
require 'rubygems'
end
-require 'rails'
-# 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/all'
+# To pick the frameworks you want, remove 'require "rails/all"'
+# and list the frameworks that you want:
#
-# require "rails/core"
+# require "rails"
# require "active_model/rails"
# require "active_record/rails"
# require "action_controller/rails"