diff options
| author | Javan Makhmali <javan@javan.us> | 2017-09-27 06:12:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 06:12:42 -0400 |
| commit | 35ecf460395341aaf0bc2a6a45fb030de6e6c5d9 (patch) | |
| tree | b5b0958552dd2a68a5f066b082bb87597a5626fe /railties/lib/rails/generators | |
| parent | a151d8ad89a3d353160d85945ab9ad44cb9e6f7a (diff) | |
| parent | bad8c9ccc91211e06e1f92b21d5eed15b2f7b2c0 (diff) | |
| download | rails-35ecf460395341aaf0bc2a6a45fb030de6e6c5d9.tar.gz rails-35ecf460395341aaf0bc2a6a45fb030de6e6c5d9.tar.bz2 rails-35ecf460395341aaf0bc2a6a45fb030de6e6c5d9.zip | |
Merge pull request #30614 from kami-zh/yarn-on-bin-update
Align `bin/update`'s Yarn usage with `bin/setup`
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/update.tt | 5 |
1 files changed, 5 insertions, 0 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 d744bec32f..70cc71d83b 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt @@ -15,6 +15,11 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') +<% unless options.skip_yarn? -%> + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') +<% end -%> <% unless options.skip_active_record? -%> puts "\n== Updating database ==" |