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

app/views/aspects/_aspect.haml

@@ -1,12 +1,12 @@
 %li{:data=>{:guid=>aspect.id}, :class => ("dull" if contacts.length == 0)}
   .right
     %b
-      = link_to t('contacts', :count => aspect.contacts.count), edit_aspect_path(aspect), :rel => 'facebox'
+      = link_to t('contacts', :count => contacts.count), edit_aspect_path(aspect), :rel => 'facebox'
   %b
     = aspect.name
   %br
 
   - if aspect.contacts.length > 0
     .contacts
-      - for contact in aspect.contacts
+      - for contact in contacts[0..16]
         = person_image_link(contact.person)

app/views/aspects/_aspect_listings.haml

@@ -15,4 +15,4 @@
 
 %ul
   - for aspect in aspects
-    = render 'aspects/aspect', :aspect => aspect, :contacts => aspect.contacts
+    = render 'aspects/aspect', :aspect => aspect, :contacts => aspect.contacts.where(:pending => false)

chef/cookbooks/centos/files/default/10gen.repo

@@ -1,5 +0,0 @@
-[10gen]
-name=10gen Repository
-baseurl=http://downloads.mongodb.org/distros/centos/5.4/os/x86_64/
-gpgcheck=0
-

chef/cookbooks/centos/recipes/main.rb

@@ -15,7 +15,6 @@ end
 harden_ruby("ree-1.8.7-2010.02")
 
 include_recipe "centos::image_magick"
-include_recipe "centos::mongo_db"
 include_recipe "common::main"
 include_recipe "centos::nginx"
 include_recipe "centos::redis"

chef/cookbooks/centos/recipes/mongo_db.rb

@@ -1,15 +0,0 @@
-cookbook_file "/etc/yum.repos.d/10gen.repo" do
-  source "10gen.repo"
-end
-
-execute "refresh yum" do
-  command "yum update -y"
-end
-
-execute "install mongo" do
-  command "yum install -y mongo-stable-server"
-end
-
-execute "make the data directory" do
-  command "mkdir -p /data/db"
-end