Update CHANGELOG.md for 10.4.1

[ci skip]

7 files changed, 15 insertions, 32 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 456f339fc24..ca632ab172e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.4.1 (2018-01-24)
+
+### Fixed (4 changes)
+
+- Ensure that users can reclaim a namespace or project path that is blocked by an orphaned route. !16242
+- Correctly escape UTF-8 path elements for uploads. !16560
+- Fix issues when rendering groups and their children. !16584
+- Fix bug in which projects with forks could not change visibility settings from Private to Public. !16595
+
+### Performance (2 changes)
+
+- rework indexes on redirect_routes.
+- Remove unecessary query from labels filter.
+
+
 ## 10.4.0 (2018-01-22)
 
 ### Security (8 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/40612-cannot-change-project-visibility-from-private-even-when-owner.yml b/changelogs/unreleased/40612-cannot-change-project-visibility-from-private-even-when-owner.yml
deleted file mode 100644
index 96bb59d303c..00000000000
--- a/changelogs/unreleased/40612-cannot-change-project-visibility-from-private-even-when-owner.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix bug in which projects with forks could not change visibility settings from
-  Private to Public
-merge_request: 16595
-author:
-type: fixed
diff --git a/changelogs/unreleased/42159-utf8-uploads.yml b/changelogs/unreleased/42159-utf8-uploads.yml
deleted file mode 100644
index f6eba8f28f5..00000000000
--- a/changelogs/unreleased/42159-utf8-uploads.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Correctly escape UTF-8 path elements for uploads
-merge_request: 16560
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-parent-preloading.yml b/changelogs/unreleased/bvl-parent-preloading.yml
deleted file mode 100644
index 97c7bbb2a2a..00000000000
--- a/changelogs/unreleased/bvl-parent-preloading.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix issues when rendering groups and their children
-merge_request: 16584
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-redirect-routes-schema.yml b/changelogs/unreleased/fix-redirect-routes-schema.yml
deleted file mode 100644
index ea2b916307a..00000000000
--- a/changelogs/unreleased/fix-redirect-routes-schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: rework indexes on redirect_routes
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/issue_37143_2.yml b/changelogs/unreleased/issue_37143_2.yml
deleted file mode 100644
index 38125f666b2..00000000000
--- a/changelogs/unreleased/issue_37143_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unecessary query from labels filter
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/mk-delete-orphaned-routes-before-validation.yml b/changelogs/unreleased/mk-delete-orphaned-routes-before-validation.yml
deleted file mode 100644
index 55ab318df7d..00000000000
--- a/changelogs/unreleased/mk-delete-orphaned-routes-before-validation.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ensure that users can reclaim a namespace or project path that is blocked by
-  an orphaned route
-merge_request: 16242
-author:
-type: fixed