From c84a571afcc39812d0cae99704a9b5919d2ec1cf Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Wed, 31 Aug 2011 23:14:30 +0200
Subject: [PATCH] new gems for rails and custom_fields (it fixes a bug with the
 has_many custom field)

---
 Gemfile                |  4 +--
 Gemfile.lock           | 56 +++++++++++++++++++++---------------------
 locomotive_cms.gemspec |  4 +--
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index b53e8466..efa5265a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source :rubygems
 
 gem 'rake', '0.9.2'
 
-gem 'rails', '3.0.9'
+gem 'rails', '3.0.10'
 
 gem 'warden'
 gem 'devise', '1.3.4'
@@ -26,7 +26,7 @@ gem 'carrierwave', '0.5.6'
 gem 'dragonfly',  '~> 0.9.1'
 gem 'rack-cache', :require => 'rack/cache'
 
-gem 'custom_fields', '1.0.0.beta.24'
+gem 'custom_fields', '1.0.0.beta.25'
 gem 'cancan'
 gem 'fog', '0.8.2'
 gem 'mimetype-fu'
diff --git a/Gemfile.lock b/Gemfile.lock
index 59559ae6..055388d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,14 +9,14 @@ GEM
     SystemTimer (1.2.3)
     ZenTest (4.6.1)
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
       mail (~> 2.2.19)
     actionmailer-with-request (0.3.0)
       rails (>= 3)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -24,19 +24,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     autotest (4.4.6)
@@ -80,7 +80,7 @@ GEM
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
       nokogiri (>= 1.4.6)
-    custom_fields (1.0.0.beta.24)
+    custom_fields (1.0.0.beta.25)
       activesupport (~> 3.0.9)
       mongoid (= 2.0.2)
     daemons (1.1.4)
@@ -189,23 +189,23 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     raindrops (0.7.0)
     rake (0.9.2)
-    rdoc (3.9.2)
+    rdoc (3.9.4)
     responders (0.6.4)
     rest-client (1.6.3)
       mime-types (>= 1.16)
@@ -292,7 +292,7 @@ DEPENDENCIES
   carrierwave (= 0.5.6)
   cells
   cucumber-rails (= 1.0.2)
-  custom_fields (= 1.0.0.beta.24)
+  custom_fields (= 1.0.0.beta.25)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)
@@ -318,7 +318,7 @@ DEPENDENCIES
   mongoid (~> 2.0.2)
   pickle
   rack-cache
-  rails (= 3.0.9)
+  rails (= 3.0.10)
   rake (= 0.9.2)
   rmagick (= 2.12.2)
   rspec-cells
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 5863ccb9..d6f0cc73 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project         = 'nowarning'
 
-  s.add_dependency 'rails', '>= 3.0.9'
+  s.add_dependency 'rails', '>= 3.0.10'
   s.add_dependency 'warden'
   s.add_dependency 'devise', '1.3.4'
   s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10'
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'dragonfly', '~> 0.9.1'
   s.add_dependency 'rack-cache'
 
-  s.add_dependency 'custom_fields', '1.0.0.beta.24'
+  s.add_dependency 'custom_fields', '1.0.0.beta.25'
   s.add_dependency 'cancan', '~> 1.6.0'
   s.add_dependency 'fog', '0.8.2'
   s.add_dependency 'mimetype-fu'