diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 09:28:41 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 10:08:06 -0800 |
commit | 5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2 (patch) | |
tree | c8ce4be48b23fc0ef09ed63c9e3c2a5befcc929a /railties/lib/generators/rails/app/templates/config/boot.rb | |
parent | 6b3fb384615003ae6cf74e8acfdb8bea9c0f683d (diff) | |
download | rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.tar.gz rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.tar.bz2 rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.zip |
Move framework requires and Bundler.require from boot.rb to app.rb. Cut down the list of railtie choices to those that make sense.
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 -%> |