From 09ed7ee152f4197f508c9f87093bc071740f6860 Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Fri, 30 Jul 2010 01:39:01 +0200
Subject: [PATCH] updating gems

---
 Gemfile                              | 10 +++++-----
 Gemfile.lock                         |  2 +-
 vendor/plugins/custom_fields/Gemfile |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d6671da..3e06c43f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ 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.14'
 gem 'mongoid_acts_as_tree', '0.1.5'
 gem 'mongo_session_store', '2.0.0.pre'
 gem 'warden'
@@ -15,7 +15,7 @@ gem 'haml', '3.0.13'
 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 'formtastic-rails3'
 gem 'carrierwave-rails3', :require => 'carrierwave'
 gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
 gem 'heroku'
@@ -34,15 +34,15 @@ group :development do
 end
 
 group :test, :development do
-  gem "ruby-debug"
+  gem 'ruby-debug'
 end
 
 group :test do
-  gem "autotest"
+  gem 'autotest'
   gem 'rspec-rails', '2.0.0.beta.18'
   gem 'factory_girl_rails'
   gem 'capybara'
-  gem "capybara-envjs", ">= 0.1.5"
+  gem 'capybara-envjs', '>= 0.1.5'
   gem 'database_cleaner'
   gem 'cucumber'
   gem 'cucumber-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index f54bde24..9db9db91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ DEPENDENCIES
   mimetype-fu
   mocha!
   mongo_session_store (= 2.0.0.pre)
-  mongoid (= 2.0.0.beta11)
+  mongoid (= 2.0.0.beta.14)
   mongoid_acts_as_tree (= 0.1.5)
   mongrel
   mongrel_experimental
diff --git a/vendor/plugins/custom_fields/Gemfile b/vendor/plugins/custom_fields/Gemfile
index 496122ec..faa2af1a 100644
--- a/vendor/plugins/custom_fields/Gemfile
+++ b/vendor/plugins/custom_fields/Gemfile
@@ -2,11 +2,11 @@ source 'http://gemcutter.org'
 
 gem 'bson_ext', '>= 1.0.1'
 gem 'mongo_ext'
-gem 'mongoid-locomotive'
+gem 'mongoid', '2.0.0.beta.14'
 gem 'activesupport', '~>3.0.0.beta'
 gem 'carrierwave-rails3', :require => 'carrierwave'
 
 group :test do
   gem 'rspec', '>= 2.0.0.beta.10'
-  gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'	
+  gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'
 end
\ No newline at end of file