diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-12-08 19:49:15 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-12-08 19:49:30 -0800 |
| commit | c873746c506e193cf6294d8919d464997d54eadb (patch) | |
| tree | 3f5c645ac20b7298b35849f6fa8dd29519d81abb /railties | |
| parent | 8d99c896e0b3cf0e55bf90a562945fa58886b85c (diff) | |
| download | rails-c873746c506e193cf6294d8919d464997d54eadb.tar.gz rails-c873746c506e193cf6294d8919d464997d54eadb.tar.bz2 rails-c873746c506e193cf6294d8919d464997d54eadb.zip | |
Only have Yarn bundling commented out as we cant be sure Yarn is installed
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup.tt | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/update.tt | 4 |
2 files changed, 2 insertions, 5 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 e4ba83a129..c6607dbb2b 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt @@ -17,7 +17,8 @@ chdir APP_ROOT do system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') <% unless options[:skip_yarn] %> - system('bin/yarn') # Ignore failure from yarn not being installed + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') <% end %> <% unless options.skip_active_record -%> 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 cc188315a8..d23af018c7 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt @@ -16,10 +16,6 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') -<% unless options[:skip_yarn] %> - system('bin/yarn') # Ignore failure from yarn not being installed - -<% end %> <% unless options.skip_active_record -%> puts "\n== Updating database ==" system! 'bin/rails db:migrate' |