diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-05-22 02:51:55 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-05-22 02:51:55 -0700 |
| commit | 2d6b71c2d5c456f28d829cd44a3f5bf5495cd669 (patch) | |
| tree | b76e08e3fd65f076117d9cb12e50e4213e7dda19 | |
| parent | d6d63767795dd5c47a57d37d075e52c2043a87bd (diff) | |
| parent | ab727743bf8a7e27ab1e1cc6097a07e5792aa7da (diff) | |
| download | rails-2d6b71c2d5c456f28d829cd44a3f5bf5495cd669.tar.gz rails-2d6b71c2d5c456f28d829cd44a3f5bf5495cd669.tar.bz2 rails-2d6b71c2d5c456f28d829cd44a3f5bf5495cd669.zip | |
Merge pull request #10722 from jgaskins/patch-1
Add ActiveModel requirement to application.rb
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index ceb2bdf371..4d474d5267 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -4,6 +4,7 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' <% else -%> # Pick the frameworks you want: +require "active_model/railtie" <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" |