diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-02-03 08:17:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 08:17:42 -0500 |
| commit | 7ca367238d9db240095241edb8a801eaf23200d7 (patch) | |
| tree | dd5084945b384c8af61acb30a0c7c5570260a024 /railties | |
| parent | 91c6eb602ad72c5b830cd5242f39768f90cf72dc (diff) | |
| parent | 422f00b32fcd8cf1fdc7da6c73b8669d8f943eb7 (diff) | |
| download | rails-7ca367238d9db240095241edb8a801eaf23200d7.tar.gz rails-7ca367238d9db240095241edb8a801eaf23200d7.tar.bz2 rails-7ca367238d9db240095241edb8a801eaf23200d7.zip | |
Merge pull request #27891 from y-yagi/ignore_yarn_error_log
Ignore yarn error log file
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index 709b341387..1768b700d9 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 ee996dc9d6..e80c253ec9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -508,6 +508,11 @@ class AppGeneratorTest < Rails::Generators::TestCase 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 |