diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-24 07:14:26 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-24 07:14:26 -0700 |
| commit | b76a96320e967d158d5979b613f8cabad28b7034 (patch) | |
| tree | b39baa66b5efee84620a5d05628f6389082f71ae /railties/lib/rails/generators | |
| parent | d5fe242d2a8aad4868a905da97da3a242fa265a4 (diff) | |
| parent | 0ec7b35e34dd6614e058ba4850fc2809455b5278 (diff) | |
| download | rails-b76a96320e967d158d5979b613f8cabad28b7034.tar.gz rails-b76a96320e967d158d5979b613f8cabad28b7034.tar.bz2 rails-b76a96320e967d158d5979b613f8cabad28b7034.zip | |
Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix
We need to have 1-0-stable for joureny gem in edge
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 52a2df350f..398319ca55 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -138,13 +138,13 @@ module Rails if options.dev? <<-GEMFILE.strip_heredoc gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' - gem 'journey', :git => 'git://github.com/rails/journey.git' + gem 'journey', :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable' gem 'arel', :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable' - gem 'journey', :git => 'git://github.com/rails/journey.git' + gem 'journey', :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable' gem 'arel', :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable' GEMFILE else |