Add back --skip-turbolinks and remove --skip-gems

For the most part of cases --skip-gems option just remove one line in
the Gemfile. This is not worth for the complexity it adds.

Closes #17196

3 files changed, 12 insertions, 16 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e1a11482e6..2960eccb3f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -89,13 +89,7 @@
 
     *Rafael Mendonça França*
 
-*   Add a generic --skip-gems options to generator
-
-    This option is useful if users want to remove some gems like jbuilder,
-    turbolinks, coffee-rails, etc that don't have specific options on the
-    generator.
-
-        rails new my_app --skip-gems turbolinks coffee-rails
+*   Add a generic --skip-turbolinks options to generator.
 
     *Rafael Mendonça França*
 
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 1eca86bd30..92ed9136a0 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -41,9 +41,6 @@ module Rails
         class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
                                           desc: 'Skip Active Record files'
 
-        class_option :skip_gems,          type: :array, default: [],
-                                          desc: 'Skip the provided gems files'
-
         class_option :skip_sprockets,     type: :boolean, aliases: '-S', default: false,
                                           desc: 'Skip Sprockets files'
 
@@ -65,6 +62,9 @@ module Rails
         class_option :edge,               type: :boolean, default: false,
                                           desc: "Setup the #{name} with Gemfile pointing to Rails repository"
 
+        class_option :skip_turbolinks,    type: :boolean, default: false,
+                                          desc: 'Skip turbolinks gem'
+
         class_option :skip_test_unit,     type: :boolean, aliases: '-T', default: false,
                                           desc: 'Skip Test::Unit files'
 
@@ -79,7 +79,7 @@ module Rails
       end
 
       def initialize(*args)
-        @gem_filter    = lambda { |gem| !options[:skip_gems].include?(gem.name) }
+        @gem_filter    = lambda { |gem| true }
         @extra_entries = []
         super
         convert_database_option_for_jruby
@@ -287,8 +287,11 @@ module Rails
                                          "Use #{options[:javascript]} as the JavaScript library")
           end
 
-          gems << GemfileEntry.version("turbolinks", nil,
-            "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+          unless options[:skip_turbolinks]
+            gems << GemfileEntry.version("turbolinks", nil,
+             "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+          end
+
           gems
         end
       end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index b492258efb..501b2e0811 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -450,12 +450,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_generator_if_skip_gems_is_given
-    run_generator [destination_root, "--skip-gems", "turbolinks", "coffee-rails"]
+  def test_generator_if_skip_turbolinks_is_given
+    run_generator [destination_root, "--skip-turbolinks"]
 
     assert_file "Gemfile" do |content|
       assert_no_match(/turbolinks/, content)
-      assert_no_match(/coffee-rails/, content)
     end
     assert_file "app/views/layouts/application.html.erb" do |content|
       assert_no_match(/data-turbolinks-track/, content)