From f7ddd4d09072ef3c483d8bff77da08e7b325cbc4 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 23 Aug 2016 01:19:58 -0700 Subject: Change merge_error column from string to text type In some cases, the artificial 255-character limit would cause an error in MergeWorker. Closes #20593 --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 25cfb5de2fa..802c928b2fc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160819221833) do +ActiveRecord::Schema.define(version: 20160823081327) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -613,7 +613,7 @@ ActiveRecord::Schema.define(version: 20160819221833) do t.integer "position", default: 0 t.datetime "locked_at" t.integer "updated_by_id" - t.string "merge_error" + t.text "merge_error" t.text "merge_params" t.boolean "merge_when_build_succeeds", default: false, null: false t.integer "merge_user_id" -- cgit v1.2.1