Update CHANGELOG.md for 10.5.5

[ci skip]

6 files changed, 14 insertions, 25 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 630aef6751f..8c64e68967e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.5.5 (2018-03-15)
+
+### Fixed (3 changes)
+
+- Fix missing uploads after group transfer. !17658
+- Fix code and wiki search results when filename is non-ASCII.
+- Remove double caching of Repository#empty?.
+
+### Performance (2 changes)
+
+- Adding missing indexes on taggings table.
+- Add index on section_name_id on ci_build_trace_sections table.
+
+
 ## 10.5.4 (2018-03-08)
 
 ### Fixed (11 changes)
diff --git a/changelogs/unreleased/fix-code-search-500-with-non-ascii-filename.yml b/changelogs/unreleased/fix-code-search-500-with-non-ascii-filename.yml
deleted file mode 100644
index 29e3b7be985..00000000000
--- a/changelogs/unreleased/fix-code-search-500-with-non-ascii-filename.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix code and wiki search results when filename is non-ASCII
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml b/changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml
deleted file mode 100644
index ba366b81600..00000000000
--- a/changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix missing uploads after group transfer
-merge_request: 17658
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-add-missing-acts-as-taggable-indices.yml b/changelogs/unreleased/sh-add-missing-acts-as-taggable-indices.yml
deleted file mode 100644
index d9a1a0db9e8..00000000000
--- a/changelogs/unreleased/sh-add-missing-acts-as-taggable-indices.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adding missing indexes on taggings table
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-add-section-name-index.yml b/changelogs/unreleased/sh-add-section-name-index.yml
deleted file mode 100644
index c822b4e851b..00000000000
--- a/changelogs/unreleased/sh-add-section-name-index.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add index on section_name_id on ci_build_trace_sections table
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-remove-double-caching-repo-empty.yml b/changelogs/unreleased/sh-remove-double-caching-repo-empty.yml
deleted file mode 100644
index 1684be4e5e3..00000000000
--- a/changelogs/unreleased/sh-remove-double-caching-repo-empty.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove double caching of Repository#empty?
-merge_request:
-author:
-type: fixed