From 3fd198d1bceb2f8bf0cec214ebf7e0a0cd9660df Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Fri, 29 Oct 2010 22:35:33 -0700
Subject: [PATCH] mongrel doesn't build under 1.9

---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1091fc7ae..457bfd75b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ group :test do
   gem 'database_cleaner', '0.5.2'
   gem 'webmock'
   gem 'jasmine', :path => 'vendor/gems/jasmine'
-  gem 'mongrel'
+  gem 'mongrel' if RUBY_VERSION.include? "1.8"
 end
 
 group :deployment do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b0e06160..bf7fd13bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,7 +117,8 @@ GEM
     addressable (2.2.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    aws (2.3.22)
+    aws (2.3.24)
+      activesupport
       http_connection
       uuidtools
       xml-simple
@@ -187,10 +188,10 @@ GEM
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
       rails (>= 3.0.0.beta4)
-    faraday (0.5.1)
+    faraday (0.5.2)
       addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
-      rack (~> 1.2.1)
+      rack (>= 1.1.0, < 2)
     fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
@@ -220,7 +221,7 @@ GEM
     mini_fb (1.1.3)
       hashie
       rest-client
-    mini_magick (2.3)
+    mini_magick (3.0)
       subexec (~> 0.0.4)
     mixlib-authentication (1.1.4)
       mixlib-log