From 8962e96e3926a0c8d11d57eb583d5879dab0637c Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 3 Aug 2011 18:14:11 -0300
Subject: This dep is already defined in activerecord.gemspec

---
 Gemfile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index ec064bbda8..f6caa1ee65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,6 @@ gemspec
 
 if ENV['AREL']
   gem "arel", :path => ENV['AREL']
-else
-  gem "arel", '~> 2.1.3'
 end
 
 gem "jquery-rails"
-- 
cgit v1.2.3


From 43e581ef7fb24d11cba37bb4a74f8915ff74f402 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 6 Aug 2011 09:15:32 -0300
Subject: Use rake >= 0.9.3.beta.1 in Ruby 1.9.3

---
 Gemfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index f6caa1ee65..e11514d5e6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,12 @@ gem "jquery-rails"
 # it being automatically loaded by sprockets
 gem "uglifier", ">= 1.0.0", :require => false
 
-gem "rake",  ">= 0.8.7"
+# Temp fix until rake 0.9.3 is out
+if RUBY_VERSION >= "1.9.3"
+  gem "rake", "0.9.3.beta.1"
+else
+  gem "rake", ">= 0.8.7"
+end
 gem "mocha", ">= 0.9.8"
 
 group :doc do
-- 
cgit v1.2.3


From 827a0fee07eff7ca35ecdf5ca650f2094ad4825a Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 27 Aug 2011 03:55:01 -0700
Subject: use sdoc to generate the API

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index e11514d5e6..f0880926a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "mocha", ">= 0.9.8"
 
 group :doc do
   gem "rdoc",  "~> 3.4"
-  gem "horo",  "= 1.0.3"
+  gem "sdoc",  "~> 0.3"
   gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
   gem "w3c_validators"
 end
-- 
cgit v1.2.3