upgrade gems (carrierwave and custom_fields)

Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 
 # add in all the runtime dependencies
 
-gem 'rails', '>= 3.0.4'
+gem 'rails', '>= 3.0.5'
 
 gem 'warden'
 gem 'devise', '= 1.1.3'
@@ -18,12 +18,10 @@ gem 'formtastic', '~> 1.2.3'
 gem 'inherited_resources', '~> 1.1.2'
 
 gem 'rmagick', '2.12.2'
-# gem 'locomotive_carrierwave', '0.5.0.1.beta2', :require => 'carrierwave'
+gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
-# gem 'carrierwave', :path => '/Users/didier/Desktop/carrierwave'
-gem 'locomotive_carrierwave', :path => '../gems/carrierwave', :require => 'carrierwave'
 
-# gem 'custom_fields', '1.0.0.beta.4'
+gem 'custom_fields', '1.0.0.beta.5'
-gem 'custom_fields', :path => '../gems/custom_fields'
+# gem 'custom_fields', :path => '../gems/custom_fields'
 gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'

Gemfile.lock

@@ -4,20 +4,6 @@ GIT
   specs:
     mocha (0.9.12.20110213002255)
 
-PATH
-  remote: ../gems/carrierwave
-  specs:
-    locomotive_carrierwave (0.5.0.1.beta3)
-      activesupport (~> 3.0)
-
-PATH
-  remote: ../gems/custom_fields
-  specs:
-    custom_fields (1.0.0.beta.4)
-      activesupport (>= 3.0.4)
-      locomotive_carrierwave
-      mongoid (~> 2.0.0.rc.7)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -84,6 +70,10 @@ GEM
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
+    custom_fields (1.0.0.beta.5)
+      activesupport (>= 3.0.4)
+      locomotive_carrierwave
+      mongoid (~> 2.0.0.rc.7)
     daemons (1.1.0)
     database_cleaner (0.6.4)
     delayed_job (2.1.2)
@@ -146,6 +136,8 @@ GEM
     linecache (0.43)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
+    locomotive_carrierwave (0.5.0.1.beta3)
+      activesupport (~> 3.0)
     locomotive_jammit-s3 (0.5.4.4)
       jammit (>= 0.5.4)
       mimemagic (>= 0.1.7)
@@ -267,7 +259,7 @@ DEPENDENCIES
   capybara
   cucumber (= 0.8.5)
   cucumber-rails
-  custom_fields!
+  custom_fields (= 1.0.0.beta.5)
   database_cleaner
   delayed_job (= 2.1.2)
   delayed_job_mongoid (= 1.0.2)
@@ -281,7 +273,7 @@ DEPENDENCIES
   httparty (>= 0.6.1)
   inherited_resources (~> 1.1.2)
   launchy
-  locomotive_carrierwave!
+  locomotive_carrierwave (= 0.5.0.1.beta3)
   locomotive_jammit-s3
   locomotive_liquid (= 2.2.2)
   locomotive_mongoid_acts_as_tree (= 0.1.5.5)
@@ -289,7 +281,7 @@ DEPENDENCIES
   mocha!
   mongoid (~> 2.0.0.rc.7)
   pickle
-  rails (>= 3.0.4)
+  rails (>= 3.0.5)
   rmagick (= 2.12.2)
   rspec-rails (= 2.3.1)
   ruby-debug

doc/TODO

@@ -1,11 +1,11 @@
 BOARD:
 
+- pull request #44
 - integrate new home
-- editable_elements: inheritable: false (Mattias)
+- editable_elements: inheritable: false (Mattias) => seems to be fixed by Dirk's last pull request (#44)
 - duostack version
 - 2 different sites on the same main domain (one in www, the other one in something else) (Raphael Costa)
 
-
 BACKLOG:
 
 
@@ -198,4 +198,11 @@ x moving to mongoid 2.0.0 rc.6
   x accepts_nested_attributes (javascript part)
   x check the theme uploader
   x release new version of CustomFields, ActsAsTree gems
-x add metadata to sites
+x add metadata to sites
+x pull requests #31 et #32
+x password / new_password
+x bugs
+  x custom_fields not deleted (doesn't use index anymore)
+  ? editable_elements slug becomes nil
+  x editable_elements not updated (doesn't use index anymore)
+  x uploading videos http://groups.google.com/group/carrierwave/browse_thread/thread/6e211d98f1ff4bc0/51717c2167695ca2?lnk=gst&q=version#51717c2167695ca2