summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
committerDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
commitfc1910ddc5db25e608921f69c3dc28d830e6ea03 (patch)
tree1f82bd43de18fdb6ec1d01801d7d75c08bdf7928 /CHANGELOG
parent63f53730c0483b4c9e6fa9d90413d40a8c74a243 (diff)
parent5341b16fc92425d557a1c62d0329b276170eba73 (diff)
downloadgitlab-ce-fc1910ddc5db25e608921f69c3dc28d830e6ea03.tar.gz
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts: # app/services/system_note_service.rb
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7cbb7901f85..470813fb9e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ v 8.8.0 (unreleased)
- Use a case-insensitive comparison in sanitizing URI schemes
- Toggle sign-up confirmation emails in application settings
- Make it possible to prevent tagged runner from picking untagged jobs
+ - Added `InlineDiffFilter` to the markdown parser. (Adam Butler)
+ - Added inline diff styling for `change_title` system notes. (Adam Butler)
- Project#open_branches has been cleaned up and no longer loads entire records into memory.
- Escape HTML in commit titles in system note messages
- Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios