From: David Yip <yipdw@member.fsf.org>
Date: Tue, 9 Jan 2018 20:16:45 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=991371af5f22ba85199f3f66bab5f70b404de95f;p=mastodon.git

Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	db/schema.rb
---

991371af5f22ba85199f3f66bab5f70b404de95f
diff --cc db/schema.rb
index b480c9c46,d1722fa29..11ca12235
--- a/db/schema.rb
+++ b/db/schema.rb
@@@ -418,8 -409,7 +418,8 @@@ ActiveRecord::Schema.define(version: 20
      t.bigint "account_id", null: false
      t.bigint "application_id"
      t.bigint "in_reply_to_account_id"
 +    t.boolean "local_only"
-     t.index ["account_id", "id"], name: "index_statuses_on_account_id_id"
+     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
      t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
      t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
      t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"