Update CHANGELOG.md for 9.1.4

[ci skip]

9 files changed, 11 insertions, 33 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e625278a796..45b8345e93e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 9.1.4 (2017-05-12)
+
+- Fix error on CI/CD Settings page related to invalid pipeline trigger. !10948 (dosuken123)
+- Sort the network graph both by commit date and topographically. !11057
+- Fix cross referencing for private and internal projects. !11243
+- Handle incoming emails from aliases correctly.
+- Gracefully handle failures for incoming emails which do not match on the To header, and have no References header.
+- Add missing project attributes to Import/Export.
+- Fixed search terms not correctly highlighting.
+- Fixed bug where merge request JSON would be displayed.
+
 ## 9.1.3 (2017-05-05)
 
 - Do not show private groups on subgroups page if user doesn't have access to.
diff --git a/changelogs/unreleased/2247-emails-forwarded-to-service-desk-email-don-t-come.yml b/changelogs/unreleased/2247-emails-forwarded-to-service-desk-email-don-t-come.yml
deleted file mode 100644
index f062143960e..00000000000
--- a/changelogs/unreleased/2247-emails-forwarded-to-service-desk-email-don-t-come.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Handle incoming emails from aliases correctly
-merge_request:
-author:
diff --git a/changelogs/unreleased/30973-network-graph-sorted-by-date-and-topo.yml b/changelogs/unreleased/30973-network-graph-sorted-by-date-and-topo.yml
deleted file mode 100644
index 42426c1865e..00000000000
--- a/changelogs/unreleased/30973-network-graph-sorted-by-date-and-topo.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Sort the network graph both by commit date and topographically
-merge_request: 11057
-author:
diff --git a/changelogs/unreleased/31274-creating-schedule-trigger--causes-http-500-when-accessing-settings-ci_cd.yml b/changelogs/unreleased/31274-creating-schedule-trigger--causes-http-500-when-accessing-settings-ci_cd.yml
deleted file mode 100644
index b0c33ab3fa4..00000000000
--- a/changelogs/unreleased/31274-creating-schedule-trigger--causes-http-500-when-accessing-settings-ci_cd.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix error on CI/CD Settings page related to invalid pipeline trigger
-merge_request: 10948
-author: dosuken123
diff --git a/changelogs/unreleased/31978-cross-reference-fix.yml b/changelogs/unreleased/31978-cross-reference-fix.yml
deleted file mode 100644
index fbcb3d5d482..00000000000
--- a/changelogs/unreleased/31978-cross-reference-fix.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix cross referencing for private and internal projects
-merge_request: 11243
-author:
diff --git a/changelogs/unreleased/dont-blow-up-when-email-has-no-references-header.yml b/changelogs/unreleased/dont-blow-up-when-email-has-no-references-header.yml
deleted file mode 100644
index a4345b70744..00000000000
--- a/changelogs/unreleased/dont-blow-up-when-email-has-no-references-header.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Gracefully handle failures for incoming emails which do not match on the To
-  header, and have no References header
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-import-export-missing-attributes.yml b/changelogs/unreleased/fix-import-export-missing-attributes.yml
deleted file mode 100644
index a1338b4eb48..00000000000
--- a/changelogs/unreleased/fix-import-export-missing-attributes.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add missing project attributes to Import/Export
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-search-not-highlighting.yml b/changelogs/unreleased/fix-search-not-highlighting.yml
deleted file mode 100644
index a624530ebd1..00000000000
--- a/changelogs/unreleased/fix-search-not-highlighting.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed search terms not correctly highlighting
-merge_request:
-author:
diff --git a/changelogs/unreleased/merge-request-poll-json-endpoint.yml b/changelogs/unreleased/merge-request-poll-json-endpoint.yml
deleted file mode 100644
index 6c41984e9b7..00000000000
--- a/changelogs/unreleased/merge-request-poll-json-endpoint.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed bug where merge request JSON would be displayed
-merge_request:
-author: