diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 11:10:27 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 11:10:27 +0100 |
| commit | 2f5ee5ed202c3ba45d123616ded9a715380f5411 (patch) | |
| tree | 872b46f6da752bf0bfc0f97b05bb03dc6eff3e09 /db | |
| parent | 35ce7aae019462b5b39b89a4f900a0c100ff71bd (diff) | |
| parent | 2e6a3b697c665006de87acc5777e6e332dee804a (diff) | |
| download | gitlab-ce-2f5ee5ed202c3ba45d123616ded9a715380f5411.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/db/schema.rb b/db/schema.rb index 9e031680c30..243d747209e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -84,7 +84,7 @@ ActiveRecord::Schema.define(version: 20160724205507) do t.string "health_check_access_token" t.boolean "send_user_confirmation_email", default: false t.integer "container_registry_token_expire_delay", default: 5 - t.boolean "user_default_external", default: false, null: false + t.boolean "user_default_external", default: false, null: false t.text "after_sign_up_text" t.string "repository_storage", default: "default" t.string "enabled_git_access_protocol" @@ -607,9 +607,9 @@ ActiveRecord::Schema.define(version: 20160724205507) do add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree create_table "merge_requests", force: :cascade do |t| - t.string "target_branch", null: false - t.string "source_branch", null: false - t.integer "source_project_id", null: false + t.string "target_branch", null: false + t.string "source_branch", null: false + t.integer "source_project_id", null: false t.integer "author_id" t.integer "assignee_id" t.string "title" @@ -618,20 +618,21 @@ ActiveRecord::Schema.define(version: 20160724205507) do t.integer "milestone_id" t.string "state" t.string "merge_status" - t.integer "target_project_id", null: false + t.integer "target_project_id", null: false t.integer "iid" t.text "description" - t.integer "position", default: 0 + t.integer "position", default: 0 t.datetime "locked_at" t.integer "updated_by_id" t.string "merge_error" t.text "merge_params" - t.boolean "merge_when_build_succeeds", default: false, null: false + t.boolean "merge_when_build_succeeds", default: false, null: false t.integer "merge_user_id" t.string "merge_commit_sha" t.datetime "deleted_at" t.string "in_progress_merge_commit_sha" end + add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree add_index "merge_requests", ["author_id"], name: "index_merge_requests_on_author_id", using: :btree add_index "merge_requests", ["created_at", "id"], name: "index_merge_requests_on_created_at_and_id", using: :btree |