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/application.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/application.rb')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/application.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb index 78a355d2f4..2872d187ba 100644 --- a/railties/lib/generators/rails/app/templates/config/application.rb +++ b/railties/lib/generators/rails/app/templates/config/application.rb @@ -1,5 +1,19 @@ require File.expand_path('../boot', __FILE__) +<% unless options[:skip_activerecord] -%> +require 'rails/all' +<% else -%> +# Pick the frameworks you want: +# require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "active_resource/railtie" +require "rails/test_unit/railtie" +<% end -%> + +# Auto-require all bundled libraries. +Bundler.require + module <%= app_const_base %> class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. |