diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
commit | 6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3 (patch) | |
tree | 3da8d75101aabe3c1d90d0582505ec1480c9d885 /railties/lib/generators/rails/app/templates/config/boot.rb | |
parent | 77bf78b3b78a41d4f2f6e733f5c9c00608c0adba (diff) | |
parent | a1b60696e2b13cbe94d748444cc0da37b190fbb8 (diff) | |
download | rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.gz rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.bz2 rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.zip |
Merge remote branch 'mainstream/master'
Conflicts:
railties/README
railties/guides/source/active_support_core_extensions.textile
railties/guides/source/getting_started.textile
railties/lib/generators/rails/app/templates/README
Diffstat (limited to 'railties/lib/generators/rails/app/templates/config/boot.rb')
-rw-r--r-- | railties/lib/generators/rails/app/templates/config/boot.rb | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 03396113e8..29c9d506e5 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/generators/rails/app/templates/config/boot.rb @@ -15,32 +15,3 @@ rescue LoadError # # require 'rubygems' end - -# Auto-require all bundled libraries. -Bundler.require - -<% unless options[:skip_activerecord] -%> -require 'rails/all' - -# To pick the frameworks you want, remove 'require "rails/all"' -# and list the framework railties that you want: -# -# require "active_support/railtie" -# require "active_model/railtie" -# require "active_record/railtie" -# require "action_controller/railtie" -# require "action_view/railtie" -# require "action_mailer/railtie" -# require "active_resource/railtie" -# require "rails/test_unit/railtie" -<% else -%> -# Pick the frameworks you want: -# require "active_model/railtie" -# require "active_record/railtie" -require "active_support/railtie" -require "action_controller/railtie" -require "action_view/railtie" -require "action_mailer/railtie" -require "active_resource/railtie" -require "rails/test_unit/railtie" -<% end -%> |