From b3b7519c7c8040d18c14a941647827aad406827e Mon Sep 17 00:00:00 2001
From: Didier Lafforgue <didier@nocoffee.fr>
Date: Thu, 8 Mar 2012 19:40:48 +0100
Subject: [PATCH] new version of the custom_fields gem

---
 Gemfile                |  4 ++--
 Gemfile.lock           | 22 ++++++++++++----------
 locomotive_cms.gemspec |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index ec089948..9fba8020 100755
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,8 @@ gemspec # Include gemspec dependencies
 # The rest of the dependencies are for use when in the locomotive development environment
 
 group :development do
-  gem 'custom_fields', :path => '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
+  # gem 'custom_fields', :path => '../gems/custom_fields' # for Developers
+  gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
 
   gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators
   gem 'rspec-cells'
diff --git a/Gemfile.lock b/Gemfile.lock
index e1dbf48f..6b68cbf9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,16 @@ GIT
       fssm (>= 0.2.7)
       sass (~> 3.1)
 
+GIT
+  remote: git://github.com/locomotivecms/custom_fields.git
+  revision: c30c7df5a502b888f63bb908c146cb0fc61ef204
+  branch: 2.0.0.rc
+  specs:
+    custom_fields (2.0.0.rc6)
+      activesupport (~> 3.2.1)
+      carrierwave-mongoid (~> 0.1.3)
+      mongoid (~> 2.4.5)
+
 PATH
   remote: .
   specs:
@@ -26,7 +36,7 @@ PATH
       carrierwave-mongoid (~> 0.1.3)
       cells (~> 3.8.0)
       codemirror-rails (~> 2.21)
-      custom_fields (~> 2.0.0.rc5)
+      custom_fields (~> 2.0.0.rc6)
       devise (~> 1.5.3)
       dragonfly (~> 0.9.8)
       flash_cookie_session (~> 1.1.1)
@@ -52,14 +62,6 @@ PATH
       rmagick (~> 2.12.2)
       sanitize (~> 2.0.3)
 
-PATH
-  remote: ../gems/custom_fields
-  specs:
-    custom_fields (2.0.0.rc5)
-      activesupport (~> 3.2.1)
-      carrierwave-mongoid (~> 0.1.3)
-      mongoid (~> 2.4.5)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -210,7 +212,7 @@ GEM
     mocha (0.9.12)
     mongo (1.5.2)
       bson (= 1.5.2)
-    mongoid (2.4.5)
+    mongoid (2.4.6)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 5ddd0c2e..832b9eca 100755
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid',                         '~> 2.4.5'
   s.add_dependency 'locomotive-mongoid-tree',         '~> 0.6.2'
 
-  s.add_dependency 'custom_fields',                   '~> 2.0.0.rc5'
+  s.add_dependency 'custom_fields',                   '~> 2.0.0.rc6'
 
   s.add_dependency 'kaminari',                        '~> 0.13.0'