diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 11:24:19 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 11:24:19 +1100 |
| commit | 485f12fe4cbf4ae9d22454a6a02c786ef10514f7 (patch) | |
| tree | e0fce1cbce6b8de43ba9c8948f554058e24a2350 /railties/lib/generators | |
| parent | d1eed079e1338249aa3b2881d07029ac4e71f4ed (diff) | |
| download | rails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.tar.gz rails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.tar.bz2 rails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.zip | |
Fixed --dev flag for new bundler
Diffstat (limited to 'railties/lib/generators')
| -rw-r--r-- | railties/lib/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/generators/rails/app/templates/Gemfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index 918bb98db8..dcb8af208f 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -181,7 +181,7 @@ module Rails::Generators end def bundle_if_dev_or_edge - run "gem bundle" if dev_or_edge? + run "bundle install" if dev_or_edge? end protected diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 50f1a6a414..ce495177eb 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -7,7 +7,7 @@ gem "rails", "<%= Rails::VERSION::STRING %>" ## Bundle edge rails: <%- if options.dev? -%> -directory "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec" +path "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec" gem "rails", "<%= Rails::VERSION::STRING %>" <%- else -%> <%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" |