Permalink
Browse files

Don't use Arel from git anymore

  • Loading branch information...
1 parent 85ffbfe commit 10d3ab79dc75f79e71fbf851a541f0dca3ae1e6f @spastorino spastorino committed Oct 14, 2010
Showing with 0 additions and 9 deletions.
  1. +0 −6 Gemfile
  2. +0 −3 railties/lib/rails/generators/rails/app/templates/Gemfile
View
6 Gemfile
@@ -1,11 +1,5 @@
source 'http://rubygems.org'
-if ENV['AREL']
- gem "arel", :path => ENV['AREL']
-else
- gem "arel", :git => "git://github.com/rails/arel.git"
-end
-
gem "rails", :path => File.dirname(__FILE__)
gem "rake", ">= 0.8.7"
View
3 railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -2,16 +2,13 @@ source 'http://rubygems.org'
<%- if options.dev? -%>
gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>'
-gem 'arel', :git => 'git://github.com/rails/arel.git'
<%- elsif options.edge? -%>
gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'arel', :git => 'git://github.com/rails/arel.git'
<%- else -%>
gem 'rails', '<%= Rails::VERSION::STRING %>'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-# gem 'arel', :git => 'git://github.com/rails/arel.git'
<%- end -%>
<% unless options[:skip_active_record] -%>

0 comments on commit 10d3ab7

Please sign in to comment.