From c2bbe4e466931f600e5cfdfcc56d664d6c373329 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Mon, 2 Jul 2012 11:34:31 -0700
Subject: [PATCH] somehow some dirty state made it into my merge :(

---
 app/assets/javascripts/app/collections/posts.js | 4 ----
 db/schema.rb                                    | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/collections/posts.js b/app/assets/javascripts/app/collections/posts.js
index 9805e75e8..47c60b682 100644
--- a/app/assets/javascripts/app/collections/posts.js
+++ b/app/assets/javascripts/app/collections/posts.js
@@ -2,7 +2,3 @@ app.collections.Posts = Backbone.Collection.extend({
   model: app.models.Post,
   url : "/posts"
 });
-
-app.collection.PublicPosts = app.collection.Posts.extend({
-  url : '/public'
-})
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index b71f2408e..7cb2c7b83 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -107,6 +107,8 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
     t.datetime "updated_at", :null => false
   end
 
+  add_index "conversations", ["author_id"], :name => "conversations_author_id_fk"
+
   create_table "invitation_codes", :force => true do |t|
     t.string   "token"
     t.integer  "user_id"
@@ -144,6 +146,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
     t.string   "target_type",             :limit => 60,                   :null => false
   end
 
+  add_index "likes", ["author_id"], :name => "likes_author_id_fk"
   add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true
   add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true
   add_index "likes", ["target_id"], :name => "index_likes_on_post_id"
@@ -169,6 +172,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk"
 
   create_table "notification_actors", :force => true do |t|
     t.integer  "notification_id"
@@ -200,7 +204,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
     t.text   "data",                 :null => false
   end
 
-  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url"
+  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>255}
 
   create_table "participations", :force => true do |t|
     t.string   "guid"