summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-03 13:44:07 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-03 13:44:07 +0000
commitdd7e927b38814c54cdaa11e8dd09ce6067615509 (patch)
treea94afdaf348bad8aa254ddb0b41055c25bf617e8
parentf4e8f6c89b88990d88d4ce6fddcb1b95a4cc89cd (diff)
downloadgitlab-ce-dd7e927b38814c54cdaa11e8dd09ce6067615509.tar.gz
Update CHANGELOG.md for 11.9.5
[ci skip]
-rw-r--r--CHANGELOG.md13
-rw-r--r--changelogs/unreleased/recreate-all-diffs-on-import.yml5
-rw-r--r--changelogs/unreleased/sh-fix-project-branches-merge-status.yml5
-rw-r--r--changelogs/unreleased/sh-fix-rugged-tree-entries.yml5
-rw-r--r--changelogs/unreleased/sh-force-gc-after-import.yml5
5 files changed, 13 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc8123a5888..76e2ed66cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.9.5 (2019-04-03)
+
+### Fixed (3 changes)
+
+- Force to recreate all MR diffs on import. !26480
+- Fix API /project/:id/branches not returning correct merge status. !26785
+- Avoid excessive recursive calls with Rugged TreeEntries. !26813
+
+### Performance (1 change)
+
+- Force a full GC after importing a project. !26803
+
+
## 11.9.3 (2019-03-27)
### Security (8 changes)
diff --git a/changelogs/unreleased/recreate-all-diffs-on-import.yml b/changelogs/unreleased/recreate-all-diffs-on-import.yml
deleted file mode 100644
index fd9124372f3..00000000000
--- a/changelogs/unreleased/recreate-all-diffs-on-import.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Force to recreate all MR diffs on import
-merge_request: 26480
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-project-branches-merge-status.yml b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml
deleted file mode 100644
index 65f41b3faf9..00000000000
--- a/changelogs/unreleased/sh-fix-project-branches-merge-status.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix API /project/:id/branches not returning correct merge status
-merge_request: 26785
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-rugged-tree-entries.yml b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml
deleted file mode 100644
index 97b27678905..00000000000
--- a/changelogs/unreleased/sh-fix-rugged-tree-entries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid excessive recursive calls with Rugged TreeEntries
-merge_request: 26813
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-force-gc-after-import.yml b/changelogs/unreleased/sh-force-gc-after-import.yml
deleted file mode 100644
index 755d66c1607..00000000000
--- a/changelogs/unreleased/sh-force-gc-after-import.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Force a full GC after importing a project
-merge_request: 26803
-author:
-type: performance