diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-07-31 15:26:12 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-07-31 15:26:12 +0200 |
| commit | 5ca385cb4ed1081d5678b094375c741e85682d75 (patch) | |
| tree | a6af8d602aa3e19e85989e03a73aeb3d86853926 /railties/lib/rails | |
| parent | f8e81d41200d9310c95dd397d65f745aa6f45d3a (diff) | |
| parent | 86a9633ce975e3e649ad09ab63edd291e38aa4f8 (diff) | |
| download | rails-5ca385cb4ed1081d5678b094375c741e85682d75.tar.gz rails-5ca385cb4ed1081d5678b094375c741e85682d75.tar.bz2 rails-5ca385cb4ed1081d5678b094375c741e85682d75.zip | |
Merge pull request #20992 from JuanitoFatas/fix/bin-setup-script
Don't fail when checking dependencies in bin/setup script
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup index a57b16444c..0c8b179827 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') or system!('bundle install') # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') |