diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-06 00:41:29 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-06 00:41:29 +0000 |
commit | ff710cfd051f6ba75deb0908c2f1e0368b670f13 (patch) | |
tree | 14b1f151dd72729ce686e5d15785d9dc8e5b33ee | |
parent | de6e006851c52b5056bc3320c5801589586f6190 (diff) | |
download | gitlab-ce-ff710cfd051f6ba75deb0908c2f1e0368b670f13.tar.gz |
Update CHANGELOG.md for 11.5.3
[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 e12a3cdcbb1..a6c6729a7fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.5.3 (2018-12-06) + +### Security (1 change) + +- Prevent a path traversal attack on global file templates. + + ## 11.5.2 (2018-12-03) ### Removed (1 change) 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 |