From 42cc763553514d54415b552797d5390425d44bdb Mon Sep 17 00:00:00 2001
From: Jacques Crocker <railsjedi@gmail.com>
Date: Thu, 29 Jul 2010 13:26:36 -0700
Subject: [PATCH] Updating dependencies (mongoid beta.15 & carrierwave)

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

diff --git a/Gemfile b/Gemfile
index 4d6671da..321870a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,11 @@
 # Edit this Gemfile to bundle your application's dependencies.
 source 'http://gemcutter.org'
-source 'http://gems.github.com'
 
 gem 'rails', '3.0.0.beta4'
 
 gem 'liquid', '2.0.0'
 gem 'bson_ext', '>= 1.0.1'
-gem 'mongoid', "2.0.0.beta11"
+gem 'mongoid', "2.0.0.beta.15"
 gem 'mongoid_acts_as_tree', '0.1.5'
 gem 'mongo_session_store', '2.0.0.pre'
 gem 'warden'
@@ -16,7 +15,7 @@ gem 'rmagick', '2.12.2'
 gem 'aws'
 gem 'mimetype-fu', :require => 'mimetype_fu'
 gem "formtastic", :git => "http://github.com/justinfrench/formtastic.git", :branch => "rails3"
-gem 'carrierwave-rails3', :require => 'carrierwave'
+gem "carrierwave", "0.5.0.beta2"
 gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
 gem 'heroku'
 gem 'httparty', '0.6.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index f54bde24..ee9083a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,7 +69,8 @@ GEM
     capybara-envjs (0.1.6)
       capybara (>= 0.3.9)
       envjs (>= 0.3.7)
-    carrierwave-rails3 (0.4.5)
+    carrierwave (0.5.0.beta2)
+      activesupport (>= 3.0.0.beta4)
     cgi_multipart_eof_fix (2.5.0)
     columnize (0.3.1)
     configuration (1.1.0)
@@ -233,7 +234,7 @@ DEPENDENCIES
   bson_ext (>= 1.0.1)
   capybara
   capybara-envjs (>= 0.1.5)
-  carrierwave-rails3
+  carrierwave (= 0.5.0.beta2)
   cgi_multipart_eof_fix
   cucumber
   cucumber-rails
@@ -252,7 +253,7 @@ DEPENDENCIES
   mimetype-fu
   mocha!
   mongo_session_store (= 2.0.0.pre)
-  mongoid (= 2.0.0.beta11)
+  mongoid (= 2.0.0.beta.15)
   mongoid_acts_as_tree (= 0.1.5)
   mongrel
   mongrel_experimental