aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-27 14:11:51 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-27 14:11:51 -0700
commit24208d9a8662e2e35afc9c64695c600b2e960418 (patch)
tree186f75ba88ac2803f820494fce877bbfdbd4549d /railties/lib/rails/generators
parentc4048b39ff00dc0d0f24854c3c1dacda7c6e217f (diff)
downloadrails-24208d9a8662e2e35afc9c64695c600b2e960418.tar.gz
rails-24208d9a8662e2e35afc9c64695c600b2e960418.tar.bz2
rails-24208d9a8662e2e35afc9c64695c600b2e960418.zip
adding a branch to arel
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/app_base.rb4
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 a942c11518..2843ac8c1a 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -139,13 +139,13 @@ module Rails
<<-GEMFILE.strip_heredoc
gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}'
gem 'journey', :git => 'git://github.com/rails/journey.git'
- gem 'arel', :git => 'git://github.com/rails/arel.git'
+ 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 'arel', :git => 'git://github.com/rails/arel.git'
+ gem 'arel', :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable'
GEMFILE
else
<<-GEMFILE.strip_heredoc