diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-13 14:04:03 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-13 14:04:03 -0700 |
| commit | ae67a63fe9c5be4b8e2ef74239ec340e99d231ac (patch) | |
| tree | 41674ee21bc537f1bf4de9beca2efc0533a3ed02 /railties/lib/rails/generators | |
| parent | 663b66fd538fc2f637f09bb27aad65449585f226 (diff) | |
| parent | f1637bf2bb00490203503fbd943b73406e043d1d (diff) | |
| download | rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.tar.gz rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.tar.bz2 rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.zip | |
Merge pull request #572 from sikachu/remove_activeresource
Remove Active Resource source files from the repository.
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb | 1 |
2 files changed, 0 insertions, 2 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 e47784994a..faf306c567 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -7,7 +7,6 @@ require 'rails/all' <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -require "active_resource/railtie" <%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb index 996ea79e67..8a8ba04a70 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb @@ -7,7 +7,6 @@ require 'rails/all' <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -require "active_resource/railtie" <%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> |