summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-07-13 05:29:49 +0000
committerDouwe Maan <douwe@gitlab.com>2016-07-13 05:29:49 +0000
commit5fea640e90fb8d5d50a777580d273f6d0f5fbb59 (patch)
tree7eaac0d580b3cd4d46e2c514f9a18d38e13d1883 /CHANGELOG
parent67668d9de67839dad746ad16ca46721bfa89ddc3 (diff)
parent489e1937043d6f58af28d11831ba6da94e90a705 (diff)
downloadgitlab-ce-5fea640e90fb8d5d50a777580d273f6d0f5fbb59.tar.gz
Merge branch 'multi-line-inline-diff' into 'master'
Render inline diffs for multiple changed lines following eachother Before: ![Screen_Shot_2016-07-11_at_00.08.27](/uploads/b14664211e0f5cef6e77a78eadfcbcdf/Screen_Shot_2016-07-11_at_00.08.27.png) After: ![Screen_Shot_2016-07-11_at_00.07.34](/uploads/567be631869a4867a2edf6ff7eda6369/Screen_Shot_2016-07-11_at_00.07.34.png) See merge request !5174
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 41f9809e64e..f1dcc40a273 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.10.0 (unreleased)
- Fix changing issue state columns in milestone view
- Update health_check gem to version 2.1.0
- Add notification settings dropdown for groups
+ - Render inline diffs for multiple changed lines following eachother
- Wildcards for protected branches. !4665
- Allow importing from Github using Personal Access Tokens. (Eric K Idema)
- API: Todos !3188 (Robert Schilling)