diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-09 16:43:54 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-09 16:43:54 +0000 |
commit | 22d25d7690a427a3f27b0428967a99d691723629 (patch) | |
tree | 54c59db63de80542dcd2b449f449145c3c78e116 | |
parent | 2ac59d83950cd2818a7eacb513edb436bde288da (diff) | |
download | gitlab-ce-22d25d7690a427a3f27b0428967a99d691723629.tar.gz |
Update CHANGELOG.md for 12.0.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 03977c489ef..2e849b4aeaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.0.5 + +### Security (2 changes) + +- Upgrade Gitaly to 1.47.2 to prevent revision flag injection exploits. +- Upgrade pages to 1.6.2 to prevent gitlab api token recovery from cookie. + + ## 12.0.4 ### Security (9 changes) 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 75975a5d686..00000000000 --- a/changelogs/unreleased/fix-gitaly-revision-flag-injection.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Gitaly to 1.47.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 5e281be0cae..00000000000 --- a/changelogs/unreleased/security-pages-api-token-recovery.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade pages to 1.6.2 to prevent gitlab api token recovery from cookie -merge_request: -author: -type: security |