diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-16 06:59:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-16 06:59:14 +0200 |
| commit | 6f9c55f820877608528e1380881df4b0f0a2dfe7 (patch) | |
| tree | 81d646f13a561ed69dbc71a2a61a4f21bf827fbd | |
| parent | 5153c0c21daa2f19b01e8ed2738e9f154bd948f7 (diff) | |
| parent | 02be30ffce1e09136cd8941ec40f7b2e52bcd14b (diff) | |
| download | rails-6f9c55f820877608528e1380881df4b0f0a2dfe7.tar.gz rails-6f9c55f820877608528e1380881df4b0f0a2dfe7.tar.bz2 rails-6f9c55f820877608528e1380881df4b0f0a2dfe7.zip | |
Merge pull request #29806 from yhirano55/remove_blank_line_in_setup
Remove blank lines in setup
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup.tt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt index ee9d077c30..a53d1fb0a9 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt @@ -15,10 +15,11 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') -<% unless options[:skip_yarn] %> +<% unless options[:skip_yarn] -%> + # Install JavaScript dependencies if using Yarn # system('bin/yarn') -<% end %> +<% end -%> <% unless options.skip_active_record -%> # puts "\n== Copying sample files ==" |