From 511185cc13c74f0d92edf68eab3c017bb1eeb773 Mon Sep 17 00:00:00 2001 From: Mark Fletcher Date: Fri, 16 Mar 2018 19:14:08 +0000 Subject: Update CHANGELOG.md for 10.4.6 [ci skip] --- CHANGELOG.md | 8 ++++++++ changelogs/unreleased/fix-auth0-unsafe-login.yml | 5 ----- changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml | 5 ----- 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 changelogs/unreleased/fix-auth0-unsafe-login.yml delete mode 100644 changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b4d3a85cac..e71ede58c39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.4.6 (2018-03-16) + +### Security (2 changes) + +- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337 +- Fix GitLab Auth0 integration signing in the wrong user. + + ## 10.4.5 (2018-03-01) ### Security (1 change) diff --git a/changelogs/unreleased/fix-auth0-unsafe-login.yml b/changelogs/unreleased/fix-auth0-unsafe-login.yml deleted file mode 100644 index 01c6ea69dcc..00000000000 --- a/changelogs/unreleased/fix-auth0-unsafe-login.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix GitLab Auth0 integration signing in the wrong user -merge_request: -author: -type: security diff --git a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml deleted file mode 100644 index 7fa6f6a5874..00000000000 --- a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed some SSRF vulnerabilities in services, hooks and integrations -merge_request: 2337 -author: -type: security -- cgit v1.2.3