diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-11-05 17:28:52 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-11-05 17:28:52 -0700 |
| commit | 89d7372dac7357134af6877ded159b16a8d3bc9b (patch) | |
| tree | d81490ab7bb57b3d481b380338678ccf09466ac1 /railties/lib/rails/generators/app_base.rb | |
| parent | 4d9f779b5475cfe8a206315b444e2cd3fc31ba5c (diff) | |
| parent | 44e751fdd4bcb60bba667ec641a4febbf1133e0f (diff) | |
| download | rails-89d7372dac7357134af6877ded159b16a8d3bc9b.tar.gz rails-89d7372dac7357134af6877ded159b16a8d3bc9b.tar.bz2 rails-89d7372dac7357134af6877ded159b16a8d3bc9b.zip | |
Merge pull request #3534 from guilleiguaran/arel-git-gemfile
Add arel to Gemfile on apps generated in edge Rails
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 10fdfdd8a9..0a79d6e86e 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -139,11 +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' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'journey', :git => 'git://github.com/rails/journey.git' + gem 'arel', :git => 'git://github.com/rails/arel.git' GEMFILE else <<-GEMFILE.strip_heredoc |