From 91370188aec8ba4f483a1e66f24627abb3df815c Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 9 Jan 2017 17:21:12 -0500
Subject: [PATCH] Update CHANGELOG.md for 8.15.4

[ci skip]
---
 CHANGELOG.md                                           | 10 ++++++++++
 .../unreleased/speed-up-group-milestone-index.yml      |  4 ----
 2 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 changelogs/unreleased/speed-up-group-milestone-index.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb7cf9f0ce0..94cc24fd1ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 8.15.4 (2017-01-09)
+
+- Make successful pipeline emails off for watchers. !8176
+- Speed up group milestone index by passing group_id to IssuesFinder. !8363
+- Don't instrument 405 Grape calls. !8445
+- Update the gitlab-markup gem to the version 1.5.1. !8509
+- Updated Turbolinks to mitigate potential XSS attacks.
+- Re-order update steps in the 8.14 -> 8.15 upgrade guide.
+- Re-add Google Cloud Storage as a backup strategy.
+
 ## 8.15.3 (2017-01-06)
 
 - Rename wiki_events to wiki_page_events in project hooks API to avoid errors. !0 (8425)
diff --git a/changelogs/unreleased/speed-up-group-milestone-index.yml b/changelogs/unreleased/speed-up-group-milestone-index.yml
deleted file mode 100644
index b5181fa66da..00000000000
--- a/changelogs/unreleased/speed-up-group-milestone-index.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Speed up group milestone index by passing group_id to IssuesFinder
-merge_request: 8363
-author:
-- 
GitLab