tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-11-30 03:17:12 +00:00
parent d020ed1e05 4c6b5dbe96
commit ad46bc9772
13 changed files with 139 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/schema.rb
View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20171125190735) do
ActiveRecord::Schema.define(version: 20171129172043) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -440,7 +440,7 @@ ActiveRecord::Schema.define(version: 20171125190735) do
t.datetime "updated_at", null: false
t.boolean "hidden", default: false, null: false
t.bigint "account_id"
t.index ["account_id"], name: "index_stream_entries_on_account_id"
t.index ["account_id", "activity_type", "id"], name: "index_stream_entries_on_account_id_and_activity_type_and_id"
t.index ["activity_id", "activity_type"], name: "index_stream_entries_on_activity_id_and_activity_type"
end