aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2016-12-01 23:30:33 -0500
committerGitHub <noreply@github.com>2016-12-01 23:30:33 -0500
commit8ce903af862d56b77d60c3809c0442cdac9d6c89 (patch)
tree7f905a61e3822e5394263f149272afa7a6ea77b9 /railties
parent4e73ffa9b45904492815f8f67d4695ef719e0350 (diff)
parentdffeb3d70cd50b0759a7481f8e83dea5d2b9e7dd (diff)
downloadrails-8ce903af862d56b77d60c3809c0442cdac9d6c89.tar.gz
rails-8ce903af862d56b77d60c3809c0442cdac9d6c89.tar.bz2
rails-8ce903af862d56b77d60c3809c0442cdac9d6c89.zip
Merge pull request #27250 from y-yagi/use_binstub_in_bin_update
use yarn binstub in `bin/update`
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/bin/update.tt2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
index 0d8ca2f902..dcd80b6ce5 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
@@ -17,7 +17,7 @@ chdir APP_ROOT do
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')
<% if options[:yarn] %>
- system! 'yarn'
+ system! 'bin/yarn'
<% end %>
<% unless options.skip_active_record -%>