Commit 72964502 authored by Andreas Brandl's avatar Andreas Brandl

Fix upstream merge conflict in db schema.

parent d97d6091
......@@ -1211,7 +1211,6 @@ ActiveRecord::Schema.define(version: 20180309160427) do
add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
<<<<<<< HEAD
create_table "index_statuses", force: :cascade do |t|
t.integer "project_id", null: false
t.datetime "indexed_at"
......@@ -1223,8 +1222,6 @@ ActiveRecord::Schema.define(version: 20180309160427) do
add_index "index_statuses", ["project_id"], name: "index_index_statuses_on_project_id", unique: true, using: :btree
=======
>>>>>>> upstream/master
create_table "internal_ids", id: :bigserial, force: :cascade do |t|
t.integer "project_id", null: false
t.integer "usage", null: false
......@@ -2678,10 +2675,7 @@ ActiveRecord::Schema.define(version: 20180309160427) do
add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade
<<<<<<< HEAD
add_foreign_key "index_statuses", "projects", name: "fk_74b2492545", on_delete: :cascade
=======
>>>>>>> upstream/master
add_foreign_key "internal_ids", "projects", on_delete: :cascade
add_foreign_key "issue_assignees", "issues", name: "fk_b7d881734a", on_delete: :cascade
add_foreign_key "issue_assignees", "users", name: "fk_5e0c8d9154", on_delete: :cascade
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment