diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-07-17 15:24:52 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-07-17 15:24:52 +0300 |
| commit | 0f19e9511995e4270144db906bf75a9e23f1b79c (patch) | |
| tree | 73d69d03de14c51ec3f56686ccd1ea8ea4630e23 | |
| parent | 224b7185d078b4102864f9e7c7d8ddbed18e4ccc (diff) | |
Update CHANGELOG.md for 10.8.6
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-issue-49133-10-8-stable-port.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-issue-49133.yml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d34ce51641..8632350ae85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.8.6 (2018-07-17) + +### Security (2 changes) + +- Fix symlink vulnerability in project import. +- Merge branch 'fix-mr-widget-border' into 'master'. + + ## 10.8.5 (2018-06-21) ### Security (5 changes) diff --git a/changelogs/unreleased/sh-fix-issue-49133-10-8-stable-port.yml b/changelogs/unreleased/sh-fix-issue-49133-10-8-stable-port.yml deleted file mode 100644 index 847220d88b2..00000000000 --- a/changelogs/unreleased/sh-fix-issue-49133-10-8-stable-port.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix symlink vulnerability in project import -merge_request: -author: -type: security diff --git a/changelogs/unreleased/sh-fix-issue-49133.yml b/changelogs/unreleased/sh-fix-issue-49133.yml deleted file mode 100644 index ef7d199d52e..00000000000 --- a/changelogs/unreleased/sh-fix-issue-49133.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Merge branch 'fix-mr-widget-border' into 'master' -merge_request: -author: -type: security |