diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-09 14:16:45 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-09 14:16:45 -0600 |
commit | 991371af5f22ba85199f3f66bab5f70b404de95f (patch) | |
tree | 3e5652e1d90596c57b70d2afac72b17f183b8734 /db/schema.rb | |
parent | e780d5951b7eb743a718d9b34a46cd8fa5561636 (diff) | |
parent | 35b84985a8b9e57cfd3ffac8a0e3937d3c7a1167 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: db/schema.rb
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index b480c9c46..11ca12235 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171226094803) do +ActiveRecord::Schema.define(version: 20180106000232) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -419,7 +419,7 @@ ActiveRecord::Schema.define(version: 20171226094803) do 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" |