From 938de31167e262cb3eb952f6be1797b4c891d34c Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 14 Nov 2016 13:25:25 +0000
Subject: [PATCH] Fix CHANGELOG

---
 CHANGELOG.md                                                  | 1 -
 ...-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56f749e94ac..549336e4dff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -797,7 +797,6 @@ entry.
 ## 8.11.0 (2016-08-22)
 
   - Use test coverage value from the latest successful pipeline in badge. !5862
-  - Add git diff context to notifications of new notes on merge requests !5855 (hoopes)
   - Add test coverage report badge. !5708
   - Remove the http_parser.rb dependency by removing the tinder gem. !5758 (tbalthazar)
   - Add Koding (online IDE) integration
diff --git a/changelogs/unreleased/hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml b/changelogs/unreleased/hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml
new file mode 100644
index 00000000000..73d8a52e001
--- /dev/null
+++ b/changelogs/unreleased/hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml
@@ -0,0 +1,4 @@
+---
+title: Add git diff context to notifications of new notes on merge requests
+merge_request:
+author: Heidi Hoopes
-- 
GitLab