diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-06 03:43:01 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-06 03:43:01 +0300 |
commit | 8bead5f88d208f6503887605611335887a754fee (patch) | |
tree | e812fa6c6a3cefec87f318fc34156345cbf14c3e | |
parent | 90d09306d976fb6ca96be6fce09e4e89b9a34c97 (diff) |
Update CHANGELOG.md for 11.3.12
[ci skip]
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | changelogs/unreleased/54857-fix-templates-path-traversal.yml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a72eae9a3..164fd8895c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.3.12 (2018-12-06) + +### Security (1 change) + +- Prevent a path traversal attack on global file templates. + + ## 11.3.11 (2018-11-26) ### Security (33 changes) diff --git a/changelogs/unreleased/54857-fix-templates-path-traversal.yml b/changelogs/unreleased/54857-fix-templates-path-traversal.yml deleted file mode 100644 index 0da02432c60..00000000000 --- a/changelogs/unreleased/54857-fix-templates-path-traversal.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent a path traversal attack on global file templates -merge_request: -author: -type: security |