diff options
| author | John T Skarbek <jtslear@gmail.com> | 2019-04-03 12:48:44 -0400 |
|---|---|---|
| committer | John T Skarbek <jtslear@gmail.com> | 2019-04-03 12:49:12 -0400 |
| commit | df2c6ccb10139ec1348c56e176d89de143a7dd4b (patch) | |
| tree | 05023cd15a3b69cbc92c9722d0ff0d4dfd10df01 | |
| parent | 4292486402affae3a8e8ef9845eb4202a4a36abf (diff) | |
| download | gitlab-ce-11-9-stable-patch-6.tar.gz | |
Revert "Update CHANGELOG.md for 11.9.5"11-9-stable-patch-6
This reverts commit 15657f6ff77552f58988b76838408737218d5b1c.
| -rw-r--r-- | CHANGELOG.md | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/recreate-all-diffs-on-import.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-project-branches-merge-status.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-rugged-tree-entries.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-force-gc-after-import.yml | 5 |
5 files changed, 21 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 15d6a0647a1..f02377ab3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,7 @@ 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 - +- Unreleased due to QA failure. ## 11.9.4 (2019-03-28) diff --git a/changelogs/unreleased/recreate-all-diffs-on-import.yml b/changelogs/unreleased/recreate-all-diffs-on-import.yml new file mode 100644 index 00000000000..fd9124372f3 --- /dev/null +++ b/changelogs/unreleased/recreate-all-diffs-on-import.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..65f41b3faf9 --- /dev/null +++ b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..97b27678905 --- /dev/null +++ b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..755d66c1607 --- /dev/null +++ b/changelogs/unreleased/sh-force-gc-after-import.yml @@ -0,0 +1,5 @@ +--- +title: Force a full GC after importing a project +merge_request: 26803 +author: +type: performance |