Update CHANGELOG.md for 10.2.5

[ci skip]

12 files changed, 20 insertions, 56 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51e6db845f7..2d4c78d6120 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.2.5 (2017-12-15)
+
+### Fixed (8 changes)
+
+- Create a fork network for forks with a deleted source. !15595
+- Correctly link to a forked project from the new fork page. !15653
+- Fix the fork project functionality for projects with hashed storage. !15671
+- Fix updateEndpoint undefined error for issue_show app root. !15698
+- Fix broken illustration images for monitoring page empty states. !15889
+- Fix related branches/Merge requests failing to load when the hostname setting is changed.
+- Fix gitlab:import:repos Rake task moving repositories into the wrong location.
+- Gracefully handle case when repository's root ref does not exist.
+
+### Performance (3 changes)
+
+- Keep track of all circuitbreaker keys in a set. !15613
+- Only load branch names for protected branch checks.
+- Optimize API /groups/:id/projects by preloading associations.
+
+
 ## 10.2.4 (2017-12-07)
 
 ### Security (3 changes)
diff --git a/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml b/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml
deleted file mode 100644
index 978930a5b8c..00000000000
--- a/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix broken illustration images for monitoring page empty states
-merge_request: 15889
-author:
-type: fixed
diff --git a/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml b/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml
deleted file mode 100644
index 4f0eaf8472f..00000000000
--- a/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix related branches/Merge requests failing to load when the hostname setting
-  is changed
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/40711-fix-forking-hashed-projects.yml b/changelogs/unreleased/40711-fix-forking-hashed-projects.yml
deleted file mode 100644
index 116d7d4e9cf..00000000000
--- a/changelogs/unreleased/40711-fix-forking-hashed-projects.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix the fork project functionality for projects with hashed storage
-merge_request: 15671
-author:
-type: fixed
diff --git a/changelogs/unreleased/40715-updateendpoint-undefined-on-issue-page.yml b/changelogs/unreleased/40715-updateendpoint-undefined-on-issue-page.yml
deleted file mode 100644
index 0328a693354..00000000000
--- a/changelogs/unreleased/40715-updateendpoint-undefined-on-issue-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix updateEndpoint undefined error for issue_show app root
-merge_request: 15698
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-circuitbreaker-keys-set.yml b/changelogs/unreleased/bvl-circuitbreaker-keys-set.yml
deleted file mode 100644
index a56456240df..00000000000
--- a/changelogs/unreleased/bvl-circuitbreaker-keys-set.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Keep track of all circuitbreaker keys in a set
-merge_request: 15613
-author:
-type: performance
diff --git a/changelogs/unreleased/bvl-double-fork.yml b/changelogs/unreleased/bvl-double-fork.yml
deleted file mode 100644
index 50bc1adde26..00000000000
--- a/changelogs/unreleased/bvl-double-fork.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Correctly link to a forked project from the new fork page.
-merge_request: 15653
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-fork-networks-for-deleted-projects.yml b/changelogs/unreleased/bvl-fork-networks-for-deleted-projects.yml
deleted file mode 100644
index 2acb98db785..00000000000
--- a/changelogs/unreleased/bvl-fork-networks-for-deleted-projects.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Create a fork network for forks with a deleted source
-merge_request: 15595
-author:
-type: fixed
diff --git a/changelogs/unreleased/protected-branches-names.yml b/changelogs/unreleased/protected-branches-names.yml
deleted file mode 100644
index 3c6767df571..00000000000
--- a/changelogs/unreleased/protected-branches-names.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Only load branch names for protected branch checks
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-fix-import-rake-task.yml b/changelogs/unreleased/sh-fix-import-rake-task.yml
deleted file mode 100644
index 9cd6d7e4a72..00000000000
--- a/changelogs/unreleased/sh-fix-import-rake-task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix gitlab:import:repos Rake task moving repositories into the wrong location
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-root-ref-repository.yml b/changelogs/unreleased/sh-fix-root-ref-repository.yml
deleted file mode 100644
index 0670db84fa6..00000000000
--- a/changelogs/unreleased/sh-fix-root-ref-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Gracefully handle case when repository's root ref does not exist"
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-optimize-groups-api.yml b/changelogs/unreleased/sh-optimize-groups-api.yml
deleted file mode 100644
index 37b74715a81..00000000000
--- a/changelogs/unreleased/sh-optimize-groups-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Optimize API /groups/:id/projects by preloading associations
-merge_request:
-author:
-type: performance