diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-22 17:24:20 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-22 17:24:20 -0300 |
| commit | b9a21f08563b7d4b77f4c48b73acd877178d55c3 (patch) | |
| tree | 35fbecd85e5ef298e3a98b20c244ee5b3bec8356 /railties | |
| parent | 8857e0604907969550cc6fbba29fd4d78928f9cd (diff) | |
| parent | 2fbdcaf58419842e96d0b3226e15f4b1623de075 (diff) | |
| download | rails-b9a21f08563b7d4b77f4c48b73acd877178d55c3.tar.gz rails-b9a21f08563b7d4b77f4c48b73acd877178d55c3.tar.bz2 rails-b9a21f08563b7d4b77f4c48b73acd877178d55c3.zip | |
Merge pull request #24278 from keram/rails_code_convention
Use || instead of `or` in bin/(update|setup) tpl as preferred by rails code convention
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/update | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup index df88bfd3bc..acae810c1a 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup @@ -15,7 +15,7 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' - system('bundle check') or system!('bundle install') + system('bundle check') || system!('bundle install') # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update b/railties/lib/rails/generators/rails/app/templates/bin/update index c6ed3ae64b..770a605fed 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/update +++ b/railties/lib/rails/generators/rails/app/templates/bin/update @@ -15,7 +15,7 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' - system 'bundle check' or system! 'bundle install' + system('bundle check') || system!('bundle install') puts "\n== Updating database ==" system! 'bin/rails db:migrate' |