diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-23 01:19:58 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-08-23 08:32:38 -0700 |
| commit | f7ddd4d09072ef3c483d8bff77da08e7b325cbc4 (patch) | |
| tree | ef4d40dd155ccfe5f40109dd49be0f8731c79727 /db/schema.rb | |
| parent | 148b8487b817a0c8854c6842109ce1abc5aa4306 (diff) | |
| download | gitlab-ce-f7ddd4d09072ef3c483d8bff77da08e7b325cbc4.tar.gz | |
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
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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" |