From 8bead5f88d208f6503887605611335887a754fee Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Thu, 6 Dec 2018 00:43:01 +0000 Subject: [PATCH] Update CHANGELOG.md for 11.3.12 [ci skip] --- CHANGELOG.md | 7 +++++++ .../unreleased/54857-fix-templates-path-traversal.yml | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/54857-fix-templates-path-traversal.yml 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 -- GitLab