diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 08:42:39 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 08:42:39 -0800 |
| commit | cf63e3053dfa9ad6d703fd14c3ac19816d013f2f (patch) | |
| tree | 4444fa48c3bd08ee3d722b45afa5273f536987f2 /railties/lib/rails/generators | |
| parent | 10c50c6b55ef75a9682201eadd8955abbbcb27d9 (diff) | |
| parent | 0c0e58c913c041c3031342e78cbf7117eb1b971c (diff) | |
| download | rails-cf63e3053dfa9ad6d703fd14c3ac19816d013f2f.tar.gz rails-cf63e3053dfa9ad6d703fd14c3ac19816d013f2f.tar.bz2 rails-cf63e3053dfa9ad6d703fd14c3ac19816d013f2f.zip | |
Merge pull request #4797 from kennyj/fix_4774
Fix GH #4744. Don't run bundle install when executing `rails new app` with --pretend option
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index d3420a6a3c..6677850a11 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -248,7 +248,7 @@ module Rails end def run_bundle - bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] + bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend] end def empty_directory_with_gitkeep(destination, config = {}) |