BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f7ddd4d0
Commit
f7ddd4d0
authored
Aug 23, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
parent
148b8487
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGELOG
CHANGELOG
+2
-0
20160823081327_change_merge_error_to_text.rb
db/migrate/20160823081327_change_merge_error_to_text.rb
+10
-0
schema.rb
db/schema.rb
+2
-2
No files found.
CHANGELOG
View file @
f7ddd4d0
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)
...
...
db/migrate/20160823081327_change_merge_error_to_text.rb
0 → 100644
View file @
f7ddd4d0
class
ChangeMergeErrorToText
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
true
DOWNTIME_REASON
=
'This migration requires downtime because it alters a column from varchar(255) to text.'
def
change
change_column
:merge_requests
,
:merge_error
,
:text
,
limit:
65535
end
end
db/schema.rb
View file @
f7ddd4d0
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201608
19221833
)
do
ActiveRecord
::
Schema
.
define
(
version:
201608
23081327
)
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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment