diff --git a/CHANGELOG.md b/CHANGELOG.md index 15aee2e99395b3733665d5e91ef7cfbf8cb48e0a..505ff96ded23ea7ab3a12f7ef5d4f10923166781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.4.10 (2018-12-06) + +### Security (1 change) + +- Prevent a path traversal attack on global file templates. + + ## 11.4.9 (2018-12-03) ### Fixed (2 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 0da02432c605192738901e08b46cfd9efaad9159..0000000000000000000000000000000000000000 --- 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