aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-01-31 20:10:22 +0900
committerkennyj <kennyj@gmail.com>2012-02-01 01:13:52 +0900
commit0c0e58c913c041c3031342e78cbf7117eb1b971c (patch)
tree5e072a7b25642f2e700d1663bcd38407a4e1dba3 /railties/lib
parent40b218977ecf171852f6b00587b77602edf180de (diff)
downloadrails-0c0e58c913c041c3031342e78cbf7117eb1b971c.tar.gz
rails-0c0e58c913c041c3031342e78cbf7117eb1b971c.tar.bz2
rails-0c0e58c913c041c3031342e78cbf7117eb1b971c.zip
Don't run bundle install when passed with --pretend option
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
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 = {})