From 49e6509a512d544a6e6685232ecb8d43c51a1a29 Mon Sep 17 00:00:00 2001
From: chris <chris@rulingcom.com>
Date: Thu, 31 Mar 2011 09:31:45 +0800
Subject: [PATCH] update gems

---
 Gemfile      |  4 +++-
 Gemfile.lock | 28 +++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index c47d4426..3f970f38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,9 @@ gem 'bson_ext'
 gem 'carrierwave'
 gem 'devise'
 gem 'mini_magick'
-gem 'mongoid', '2.0.0.rc.6'
+gem 'mongoid'
+
+# gem 'rblog', :path => 'lib/rblog'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 468e7db2..83d8ff84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,16 +28,17 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    arel (2.0.7)
+    arel (2.0.9)
     bcrypt-ruby (2.1.4)
-    bson (1.2.0)
-    bson_ext (1.2.0)
+    bson (1.2.4)
+    bson_ext (1.2.4)
     builder (2.1.2)
-    carrierwave (0.5.1)
+    carrierwave (0.5.3)
       activesupport (~> 3.0)
-    devise (1.1.5)
+    devise (1.2.1)
       bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
@@ -49,16 +50,17 @@ GEM
     mime-types (1.16)
     mini_magick (3.2)
       subexec (~> 0.0.4)
-    mongo (1.2.0)
-      bson (>= 1.2.0)
-    mongoid (2.0.0.rc.6)
+    mongo (1.2.4)
+      bson (>= 1.2.4)
+    mongoid (2.0.0)
       activemodel (~> 3.0)
       mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
+    orm_adapter (0.0.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
@@ -80,7 +82,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.25)
     warden (1.0.3)
       rack (>= 1.0.0)
     will_paginate (3.0.pre2)
@@ -93,5 +95,5 @@ DEPENDENCIES
   carrierwave
   devise
   mini_magick
-  mongoid (= 2.0.0.rc.6)
+  mongoid
   rails (= 3.0.3)