diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
| commit | a6fb1c58eead1357a307813c69f798f32bcf7cae (patch) | |
| tree | d56d2721705d86a925279a737943cbaa28a60979 /db/schema.rb | |
| parent | 530fcc1c14d2b7a38c1b734c0b18955f109f0f20 (diff) | |
| parent | 38e0133e1b01c21a710111097102a6eb205b9b9b (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 816b3a030..bc44b65af 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: 20180109143959) do +ActiveRecord::Schema.define(version: 20180204034416) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -182,6 +182,15 @@ ActiveRecord::Schema.define(version: 20180109143959) do t.index ["account_id"], name: "index_glitch_keyword_mutes_on_account_id" end + create_table "identities", id: :serial, force: :cascade do |t| + t.integer "user_id" + t.string "provider", default: "", null: false + t.string "uid", default: "", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_identities_on_user_id" + end + create_table "imports", force: :cascade do |t| t.integer "type", null: false t.boolean "approved", default: false, null: false @@ -536,7 +545,11 @@ ActiveRecord::Schema.define(version: 20180109143959) do add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade +<<<<<<< HEAD add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade +======= + add_foreign_key "identities", "users", on_delete: :cascade +>>>>>>> origin/master add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade add_foreign_key "invites", "users", on_delete: :cascade add_foreign_key "list_accounts", "accounts", on_delete: :cascade |