diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-21 23:08:43 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-22 16:54:10 +0300 |
| commit | 2e37fb655d44e29ea68c28957bfa047f40469aeb (patch) | |
| tree | 9a13f4bece881d4bf81156c28726e50183bc5b1d /railties/lib/rails/generators/rails/app/templates/bin/setup.tt | |
| parent | dc6761592009e9146552fc9d6299bf58a34e187a (diff) | |
| download | rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.gz rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.bz2 rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.zip | |
Remove `--skip-yarn` in favor of `--skip-javascript`
Since #33079 Webpacker the default JavaScript compiler for Rails.
Webpacker uses `yarn` so seems like it doesn't make sense for Rails to keep
`--skip-yarn` option.
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/bin/setup.tt')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup.tt | 4 |
1 files changed, 2 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 955a424878..a18e03e7db 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt @@ -14,9 +14,9 @@ FileUtils.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_javascript? -%> - # Install JavaScript dependencies if using Yarn + # Install JavaScript dependencies # system('bin/yarn') <% end -%> <% unless options.skip_active_record? -%> |