diff options
author | Dan Olson <daniel.olson@code42.com> | 2014-09-23 18:43:18 -0500 |
---|---|---|
committer | Dan Olson <daniel.olson@code42.com> | 2014-09-24 10:25:59 -0500 |
commit | 8e9bc11d22d016e02c7df8112b0e6ecc2b9274ee (patch) | |
tree | ebc1e6a144287b5b5364161063318e3ed6cfaf36 /railties/lib/rails/generators/rails | |
parent | 4e8ea13ba1a0870905a46fac5f232d9f41eef8a4 (diff) | |
download | rails-8e9bc11d22d016e02c7df8112b0e6ecc2b9274ee.tar.gz rails-8e9bc11d22d016e02c7df8112b0e6ecc2b9274ee.tar.bz2 rails-8e9bc11d22d016e02c7df8112b0e6ecc2b9274ee.zip |
Remove --skip-action-view option from application generator
Diffstat (limited to 'railties/lib/rails/generators/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/application.rb | 2 |
2 files changed, 2 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 9445c2454e..111b680e4b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -9,7 +9,7 @@ require "active_job/railtie" <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -<%= comment_if :skip_action_view %>require "action_view/railtie" +require "action_view/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/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb index 5508829f6b..b2aa82344a 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb @@ -7,7 +7,7 @@ require 'rails/all' <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -<%= comment_if :skip_action_view %>require "action_view/railtie" +require "action_view/railtie" <%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> |