diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-23 16:09:15 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-23 16:09:15 +0000 |
| commit | f2b36bfd147c63090c99145fa181a9ab83aa596f (patch) | |
| tree | ba0eb74e2dae100b393d05fac74081fcee1fc266 /CHANGELOG | |
| parent | 233e57a644dd51c29c0463ffd729f611feefba80 (diff) | |
| parent | f7ddd4d09072ef3c483d8bff77da08e7b325cbc4 (diff) | |
| download | gitlab-ce-f2b36bfd147c63090c99145fa181a9ab83aa596f.tar.gz | |
Merge branch 'change-merge-error-to-text' into 'master'
Change merge_error column from string to text type
See merge request !5950
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 97bd6316b55..01940f71d7b 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 |