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:06:48 -0700 |
| commit | c16a31b931f665924e27959116b7f840064bbd95 (patch) | |
| tree | 0c51ba8ecabbc5c21d00c2b35ae27ea6a658e871 | |
| parent | 148b8487b817a0c8854c6842109ce1abc5aa4306 (diff) | |
| download | gitlab-ce-change-merge-error-to-text.tar.gz | |
Change merge_error column from string to text typechange-merge-error-to-text
In some cases, the artificial 255-character limit would cause an error in
MergeWorker. In PostgreSQL, this MR will just cause Rails to use a higher
limit. In MySQL, this MR will change the database column type.
Closes #20593
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | db/migrate/20160823081327_change_merge_error_to_text.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0ea728cf89b..ea94cf8781b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. + v 8.12.0 (unreleased) + - Change merge_error column from string to text type - Optimistic locking for Issues and Merge Requests (title and description overriding prevention) v 8.11.0 (unreleased) diff --git a/db/migrate/20160823081327_change_merge_error_to_text.rb b/db/migrate/20160823081327_change_merge_error_to_text.rb new file mode 100644 index 00000000000..2f4db63cb87 --- /dev/null +++ b/db/migrate/20160823081327_change_merge_error_to_text.rb @@ -0,0 +1,9 @@ +class ChangeMergeErrorToText < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = true + + def change + change_column :merge_requests, :merge_error, :text, limit: 65535 + end +end 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" |