diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 05:31:20 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 05:31:20 -0800 |
| commit | bc85fcb05269a2293d97eab140e9f934b151b51a (patch) | |
| tree | 1d30f68db041b3ea8711de6832e5ef0364550f54 /railties/lib | |
| parent | ee6e3c128b721570c8e59f507ea605cdd752cf7f (diff) | |
| parent | 5bfee55947909506d133c9b336da989fd4903bd7 (diff) | |
| download | rails-bc85fcb05269a2293d97eab140e9f934b151b51a.tar.gz rails-bc85fcb05269a2293d97eab140e9f934b151b51a.tar.bz2 rails-bc85fcb05269a2293d97eab140e9f934b151b51a.zip | |
Merge pull request #4920 from guilleiguaran/revert-gemfile-edge
In Rails 3.2.x --edge generate apps with rails 3-2-stable
Diffstat (limited to 'railties/lib')
| -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 4efb643d44..1ebe56c6ab 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -143,7 +143,7 @@ module Rails GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc - gem 'rails', :git => 'git://github.com/rails/rails.git' + gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable' gem 'journey', :git => 'git://github.com/rails/journey.git' gem 'arel', :git => 'git://github.com/rails/arel.git' GEMFILE |