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

Merge branch 'master' into glitch-soc/merge

Browse Source 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
This commit is contained in:
Thibaut Girka
2018-05-11 18:12:42 +02:00
parent 34142ab29c 352bae8c3e
commit 45fce0e496
110 changed files with 1476 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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: 2018_05_06_221944) do
ActiveRecord::Schema.define(version: 2018_05_10_230049) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -560,6 +560,10 @@ ActiveRecord::Schema.define(version: 2018_05_06_221944) do
t.json "data"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "access_token_id"
t.bigint "user_id"
t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id"
t.index ["user_id"], name: "index_web_push_subscriptions_on_user_id"
end
create_table "web_settings", force: :cascade do |t|
@ -629,5 +633,7 @@ ActiveRecord::Schema.define(version: 2018_05_06_221944) do
add_foreign_key "subscriptions", "accounts", name: "fk_9847d1cbb5", on_delete: :cascade
add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade
add_foreign_key "users", "invites", on_delete: :nullify
add_foreign_key "web_push_subscriptions", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
add_foreign_key "web_push_subscriptions", "users", on_delete: :cascade
add_foreign_key "web_settings", "users", name: "fk_11910667b2", on_delete: :cascade
end