diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-25 01:06:12 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-25 01:12:22 +0100 |
| commit | 3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f (patch) | |
| tree | acd1fdb20cd5a63e6867c2befb07de8f46ab66ec /railties/lib/generators/rails/app/templates/config/boot.rb | |
| parent | 396003fc48d7c0ba206ad059646c7414bee22a36 (diff) | |
| download | rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.gz rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.bz2 rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.zip | |
Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.
Diffstat (limited to 'railties/lib/generators/rails/app/templates/config/boot.rb')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/boot.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index cbfa5ca3e9..e91304451b 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/generators/rails/app/templates/config/boot.rb @@ -20,6 +20,7 @@ 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" @@ -27,6 +28,7 @@ require 'rails/all' # require "active_resource/railtie" <% else -%> # Pick the frameworks you want: +# require "active_model/railtie" # require "active_record/railtie" require "active_support/railtie" require "action_controller/railtie" |