diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-09 16:43:32 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-09 16:43:32 +0000 |
| commit | a5cde2d96d8606cc84bb07497b3c1ad9b9848e05 (patch) | |
| tree | 37c7823f54e945af1525e24ba60f295047dadab3 | |
| parent | 183d3e1fe08b1f15d36db8f788d2e701eec06c39 (diff) | |
| download | gitlab-ce-a5cde2d96d8606cc84bb07497b3c1ad9b9848e05.tar.gz | |
Update CHANGELOG.md for 12.1.5
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-gitaly-revision-flag-injection.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-pages-api-token-recovery.yml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0752708d5e8..59edc49b890 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.1.5 + +### Security (2 changes) + +- Upgrade Gitaly to 1.53.2 to prevent revision flag injection exploits. +- Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie. + + ## 12.1.4 ### Fixed (3 changes, 1 of them is from the community) diff --git a/changelogs/unreleased/fix-gitaly-revision-flag-injection.yml b/changelogs/unreleased/fix-gitaly-revision-flag-injection.yml deleted file mode 100644 index d74d0d515bb..00000000000 --- a/changelogs/unreleased/fix-gitaly-revision-flag-injection.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Gitaly to 1.53.2 to prevent revision flag injection exploits -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-pages-api-token-recovery.yml b/changelogs/unreleased/security-pages-api-token-recovery.yml deleted file mode 100644 index b8193368360..00000000000 --- a/changelogs/unreleased/security-pages-api-token-recovery.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie -merge_request: -author: -type: security |