Merge branch 'master' of github.com:diaspora/diaspora

lib/tasks/migrations.rake

@@ -30,11 +30,13 @@ namespace :migrations do
   task :contacts_as_requests do
     require File.join(Rails.root,"config/environment")
     puts "Migrating contacts..."
-    old_contacts =  Contact.all(:pending => nil)
+    MongoMapper.database.eval('
-    old_contacts.each{|contact| contact.pending = false; contact.save}
+      db.contacts.find({pending : null}).forEach(function(contact){
+        db.contacts.update({"_id" : contact["_id"]}, {"$set" : {"pending" : false}}); });')
     puts "Deleting stale requests..."
-    old_requests = Request.all(:sent => true)
+    Request.find_each(:sent => true){|request|
-    old_requests.each{|request| request.delete}
+      request.delete
+    }
     puts "Done!"
   end