summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-31 20:51:12 -0700
committerRémy Coutable <remy@rymai.me>2016-08-01 13:24:06 +0200
commit3fe18525ddca414017d330e992999bad05002fa8 (patch)
tree04836fccf41e3228324f162dbb399c9e3c0360be /CHANGELOG
parente91fe7553db6f1e9d286df4941a1847f27a767d5 (diff)
downloadgitlab-ce-3fe18525ddca414017d330e992999bad05002fa8.tar.gz
Trim extra displayed carriage returns in diffs and files with CRLFs
Closes #20440
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 95aeda301f7..0061bba03b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,6 +44,7 @@ v 8.10.3 (unreleased)
- Properly abort a merge when merge conflicts occur
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.
- Fix Import/Export issue importing milestones and labels not associated properly
+ - Trim extra displayed carriage returns in diffs and files with CRLFs
v 8.10.2
- User can now search branches by name. !5144