summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md10
-rw-r--r--changelogs/unreleased/224674-fix-update_routes_for_lost_and_found_group_and_orphaned_projects-c.yml5
-rw-r--r--changelogs/unreleased/jc-add-seed-to-repository-storages-weighted.yml5
-rw-r--r--changelogs/unreleased/sh-fix-rake-verify-task.yml5
-rw-r--r--changelogs/unreleased/sh-reseed-repository-storages.yml5
5 files changed, 10 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0ee1674c4..ed1b71a90de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.1.4 (2020-07-09)
+
+### Fixed (4 changes)
+
+- Fix path conflict for Ghost on UpdateRoutesForLostAndFoundGroupAndOrphanedProjects. !35425
+- Fix existing repository_storages_weighted migrations. !35814
+- Fix error 500s creating new projects due to empty weights. !35829
+- Fix gitlab:*:check Rake tasks. !35944
+
+
## 13.1.3 (2020-07-06)
- No changes.
diff --git a/changelogs/unreleased/224674-fix-update_routes_for_lost_and_found_group_and_orphaned_projects-c.yml b/changelogs/unreleased/224674-fix-update_routes_for_lost_and_found_group_and_orphaned_projects-c.yml
deleted file mode 100644
index 39010dbb9c8..00000000000
--- a/changelogs/unreleased/224674-fix-update_routes_for_lost_and_found_group_and_orphaned_projects-c.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix path conflict for Ghost on UpdateRoutesForLostAndFoundGroupAndOrphanedProjects
-merge_request: 35425
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-add-seed-to-repository-storages-weighted.yml b/changelogs/unreleased/jc-add-seed-to-repository-storages-weighted.yml
deleted file mode 100644
index 627697f510c..00000000000
--- a/changelogs/unreleased/jc-add-seed-to-repository-storages-weighted.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix existing repository_storages_weighted migrations
-merge_request: 35814
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-rake-verify-task.yml b/changelogs/unreleased/sh-fix-rake-verify-task.yml
deleted file mode 100644
index e69d9d8e06d..00000000000
--- a/changelogs/unreleased/sh-fix-rake-verify-task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix gitlab:*:check Rake tasks
-merge_request: 35944
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-reseed-repository-storages.yml b/changelogs/unreleased/sh-reseed-repository-storages.yml
deleted file mode 100644
index d8d96b86e34..00000000000
--- a/changelogs/unreleased/sh-reseed-repository-storages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix error 500s creating new projects due to empty weights
-merge_request: 35829
-author:
-type: fixed