diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-04 14:53:07 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-04 14:53:07 +0000 |
| commit | d41fd1cfaa252c10be70da766069698e73990473 (patch) | |
| tree | 75b43bc02b2cd1e30ee8440a97a67bb5ff6969dc | |
| parent | c3f4ae854587754076e531e1868196c571be3552 (diff) | |
| download | gitlab-ce-d41fd1cfaa252c10be70da766069698e73990473.tar.gz | |
Update CHANGELOG.md for 11.9.6
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -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, 13 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f02377ab3ea..05e2f63b4fd 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.6 (2019-04-04) + +### 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.5 (2019-04-03) - Unreleased due to QA failure. 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 |