kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Only have Yarn bundling commented out as we cant be sure Yarn is installed

This commit is contained in:
David Heinemeier Hansson 2016-12-08 19:49:15 -08:00
parent 8d99c896e0
commit c873746c50
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
railties/lib/rails/generators/rails/app/templates/bin/setup.tt
View File

@ -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 -%>

4
railties/lib/rails/generators/rails/app/templates/bin/update.tt
View File

@ -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'