diff options
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index d250d65fe21..8882377f9f4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -628,8 +628,8 @@ ActiveRecord::Schema.define(version: 20160716115710) do 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 @@ -862,11 +862,12 @@ ActiveRecord::Schema.define(version: 20160716115710) do add_index "projects", ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree create_table "protected_branches", force: :cascade do |t| - t.integer "project_id", null: false - t.string "name", null: false + t.integer "project_id", null: false + t.string "name", null: false t.datetime "created_at" t.datetime "updated_at" - t.boolean "developers_can_push", default: false, null: false + t.boolean "developers_can_push", default: false, null: false + t.boolean "developers_can_merge", default: false, null: false end add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree |