diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 709b341387a16da8f147b9bf67cecd4518af8b4b..1768b700d97d145c096dfe5ec8fb419d8d8e1c8f 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -23,6 +23,7 @@
 
 <% unless options[:skip_yarn] -%>
 /vendor/node_modules
+/vendor/yarn-error.log
 
 <% end -%>
 .byebug_history
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ee996dc9d6798c34b14730345969f9ec86b07a0d..e80c253ec9ae64df1abee3a10a587c3b346c1602 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -508,6 +508,11 @@ def test_generator_for_yarn_skipped
     assert_file "config/initializers/assets.rb" do |content|
       assert_no_match(/node_modules/, content)
     end
+
+    assert_file ".gitignore" do |content|
+      assert_no_match(/vendor\/node_modules/, content)
+      assert_no_match(/vendor\/yarn-error\.log/, content)
+    end
   end
 
   def test_inclusion_of_jbuilder