diff options
| author | Marek L <nospam.keram@gmail.com> | 2016-03-22 20:11:52 +0000 |
|---|---|---|
| committer | Marek L <nospam.keram@gmail.com> | 2016-03-22 20:11:52 +0000 |
| commit | 2fbdcaf58419842e96d0b3226e15f4b1623de075 (patch) | |
| tree | ab1314b7a2659411e66ea6cb4b58c82c4def1962 /railties/lib | |
| parent | 63f5a98bacbced546ec9dce7a44c908c664b2f55 (diff) | |
| download | rails-2fbdcaf58419842e96d0b3226e15f4b1623de075.tar.gz rails-2fbdcaf58419842e96d0b3226e15f4b1623de075.tar.bz2 rails-2fbdcaf58419842e96d0b3226e15f4b1623de075.zip | |
Use || instead of `or` as preferred in rails code convention
Diffstat (limited to 'railties/lib')
| -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' |