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

Merge branch 'gs-master' into prevent-local-only-federation

Browse Source 
Conflicts:
	db/schema.rb
This commit is contained in:
David Yip
2017-12-15 12:20:56 -06:00
parent 6abb0950c6 e0a573a2ce
commit 82b2e224a2
217 changed files with 2868 additions and 1294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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: 20171210213213) do
ActiveRecord::Schema.define(version: 20171212195226) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -211,14 +211,12 @@ ActiveRecord::Schema.define(version: 20171210213213) do
t.bigint "account_id", null: false
t.bigint "follow_id", null: false
t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
t.index ["account_id"], name: "index_list_accounts_on_account_id"
t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
t.index ["list_id"], name: "index_list_accounts_on_list_id"
end
create_table "lists", force: :cascade do |t|
t.bigint "account_id"
t.bigint "account_id", null: false
t.string "title", default: "", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false