Commit cfc95b82 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Fix schema

parent 0e96d6eb
...@@ -494,6 +494,9 @@ ActiveRecord::Schema.define(version: 20151203162133) do ...@@ -494,6 +494,9 @@ ActiveRecord::Schema.define(version: 20151203162133) do
t.datetime "locked_at" t.datetime "locked_at"
t.integer "updated_by_id" t.integer "updated_by_id"
t.string "merge_error" t.string "merge_error"
t.text "merge_params"
t.boolean "merge_when_build_succeeds", default: false, null: false
t.integer "merge_user_id"
end end
add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
......
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