diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-03 09:46:53 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-03 09:46:53 +0100 |
| commit | 1bbeafc3e1a0e4472a0d8124c9d4711356cde2d0 (patch) | |
| tree | 1223af9ebd60b51e1903d0c27d716d1ff5bae639 /db/schema.rb | |
| parent | 4477f7bb5925d8d720e3e8272bd882fffcc04b28 (diff) | |
| parent | d51ad1ea6407d3cb9eafd9fc891c7348b10b108f (diff) | |
| download | gitlab-ce-1bbeafc3e1a0e4472a0d8124c9d4711356cde2d0.tar.gz | |
Merge remote-tracking branch 'origin/master' into 38464-k8s-apps
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 02df408b45e..d4f1b192acf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1036,6 +1036,7 @@ ActiveRecord::Schema.define(version: 20171031100710) do t.boolean "ref_fetched" t.string "merge_jid" t.boolean "discussion_locked" + t.integer "latest_merge_request_diff_id" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree @@ -1044,6 +1045,7 @@ ActiveRecord::Schema.define(version: 20171031100710) do add_index "merge_requests", ["deleted_at"], name: "index_merge_requests_on_deleted_at", using: :btree add_index "merge_requests", ["description"], name: "index_merge_requests_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"} add_index "merge_requests", ["head_pipeline_id"], name: "index_merge_requests_on_head_pipeline_id", using: :btree + add_index "merge_requests", ["latest_merge_request_diff_id"], name: "index_merge_requests_on_latest_merge_request_diff_id", using: :btree add_index "merge_requests", ["milestone_id"], name: "index_merge_requests_on_milestone_id", using: :btree add_index "merge_requests", ["source_branch"], name: "index_merge_requests_on_source_branch", using: :btree add_index "merge_requests", ["source_project_id", "source_branch"], name: "index_merge_requests_on_source_project_id_and_source_branch", using: :btree @@ -1733,7 +1735,6 @@ ActiveRecord::Schema.define(version: 20171031100710) do t.string "skype", default: "", null: false t.string "linkedin", default: "", null: false t.string "twitter", default: "", null: false - t.string "authentication_token" t.string "bio" t.integer "failed_attempts", default: 0 t.datetime "locked_at" @@ -1783,7 +1784,6 @@ ActiveRecord::Schema.define(version: 20171031100710) do end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree - add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree add_index "users", ["created_at"], name: "index_users_on_created_at", using: :btree add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree @@ -1915,6 +1915,7 @@ ActiveRecord::Schema.define(version: 20171031100710) do add_foreign_key "merge_request_metrics", "ci_pipelines", column: "pipeline_id", on_delete: :cascade add_foreign_key "merge_request_metrics", "merge_requests", on_delete: :cascade add_foreign_key "merge_requests", "ci_pipelines", column: "head_pipeline_id", name: "fk_fd82eae0b9", on_delete: :nullify + add_foreign_key "merge_requests", "merge_request_diffs", column: "latest_merge_request_diff_id", name: "fk_06067f5644", on_delete: :nullify add_foreign_key "merge_requests", "projects", column: "target_project_id", name: "fk_a6963e8447", on_delete: :cascade add_foreign_key "merge_requests_closing_issues", "issues", on_delete: :cascade add_foreign_key "merge_requests_closing_issues", "merge_requests", on_delete: :cascade |