diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
| commit | 02fc6fbccdd3345e95592cc14e7855e2f1ea14b3 (patch) | |
| tree | b26b91e2b2fad62ec382c9cee4ca2ac318f09257 /Gemfile | |
| parent | 2ba06b48defaca940e7c878724e2fb1c090eaa92 (diff) | |
| parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
| download | rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.gz rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.bz2 rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/persistence.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,7 @@ source 'http://rubygems.org' +gemspec + if ENV['AREL'] gem "arel", :path => ENV['AREL'] else @@ -7,7 +9,6 @@ else end gem "rack", :git => "git://github.com/rack/rack.git" -gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" |