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

app/views/notifications/index.mobile.haml

@@ -10,11 +10,11 @@
         - notes.each do |note|
           .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
 
-            = person_image_link(note.actor)
+            = person_image_link(note.actors.last)
 
             .content
               %span.from
-                %b= note.actor.name
+                %b= notification_people_link(note)
               = object_link(note)
               .time= timeago(note.updated_at)
 

db/schema.rb

@@ -80,6 +80,19 @@ ActiveRecord::Schema.define(:version => 20110202015222) do
 
   add_index "data_points", ["statistic_id"], :name => "index_data_points_on_statistic_id"
 
+  create_table "histories", :force => true do |t|
+    t.string   "message"
+    t.string   "username"
+    t.integer  "item"
+    t.string   "table"
+    t.integer  "month",      :limit => 2
+    t.integer  "year",       :limit => 8
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "histories", ["item", "table", "month", "year"], :name => "index_histories_on_item_and_table_and_month_and_year"
+
   create_table "invitations", :force => true do |t|
     t.text     "message"
     t.integer  "sender_id",    :null => false
@@ -459,6 +472,7 @@ ActiveRecord::Schema.define(:version => 20110202015222) do
     t.string   "mongo_id"
     t.string   "invitation_service"
     t.string   "invitation_identifier"
+    t.text     "open_aspects"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"

spec/controllers/people_controller_spec.rb

@@ -83,7 +83,7 @@ describe PeopleController do
       it 'takes time' do
         Benchmark.realtime{
           get :show, :id => @user.person.id
-        }.should < 0.2
+        }.should < 0.5
       end
     end
     it 'renders with a post' do