summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-11 14:13:56 +0000
committerRémy Coutable <remy@rymai.me>2016-10-11 14:13:56 +0000
commit239d2a7b8b84ee73851d33bc9ada8c99afb9c487 (patch)
tree22fe800a77c0865f9e49580d7389585593722fa1
parent5c6cbfa6cbc6cb82ba20e615c27f98649265b4ce (diff)
parent75fa98bb93a416aaf16ff832b0bcc98abbbdaa19 (diff)
downloadgitlab-ce-239d2a7b8b84ee73851d33bc9ada8c99afb9c487.tar.gz
Merge branch 'sh-fix-changelog' into 'master'
Remove duplicate CHANGELOG entry mail_room was bumped for 8.12.5. See merge request !6806
-rw-r--r--CHANGELOG1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0c5955eb59a..ffbaefdb5f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,6 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
- Truncate long labels with ellipsis in labels page
- - Bump mail_room to v0.8.1 to fix thread cleanup issue
- Update runner version only when updating contacted_at
- Add link from system note to compare with previous version
- Improve issue load time performance by avoiding ORDER BY in find_by call