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 | |
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')
3 files changed, 3 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 1cdad09391..0d95bb48e0 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -44,9 +44,6 @@ module Rails class_option :skip_gems, type: :array, default: [], desc: 'Skip the provided gems files' - class_option :skip_action_view, type: :boolean, aliases: '-V', default: false, - desc: 'Skip Action View files' - class_option :skip_sprockets, type: :boolean, aliases: '-S', default: false, desc: 'Skip Sprockets files' @@ -167,7 +164,7 @@ module Rails end def include_all_railties? - !options[:skip_active_record] && !options[:skip_action_view] && !options[:skip_test_unit] && !options[:skip_sprockets] + !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets] end def comment_if(value) 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 -%> |