diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
| commit | 965fe59bff249ad91131a444e1fbd63dc4411db3 (patch) | |
| tree | ec2d54d5eaad9e32bce1758e6a67c364279bbd39 /railties/lib/generators/rails/app/templates/config/application.rb | |
| parent | 79f02a473cb6aef00003745f23802314c8c89e7d (diff) | |
| parent | 4adcbb6b2d6cef49ac28df4254ac74e09f14dcf7 (diff) | |
| download | rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.gz rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.bz2 rails-965fe59bff249ad91131a444e1fbd63dc4411db3.zip | |
Merge branch 'master' of github.com:lifo/docrails
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..7c555c2542 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 default libraries and those for the current Rails environment. +Bundler.require :default, Rails.env + module <%= app_const_base %> class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. |