Fix schema

cfc95b82 · Zeger-Jan van de Weg · 0e96d6eb · cfc95b82
Commit cfc95b82 authored Dec 07, 2015 by Zeger-Jan van de Weg
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

db/schema.rb db/schema.rb +8 -5

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -494,6 +494,9 @@ ActiveRecord::Schema.define(version: 20151203162133) do
    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.integer  "merge_user_id"
  end

  add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree