From 6925477687acf32fdd6add29cbd9dbacbab04f48 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 8 Nov 2017 17:49:24 +0800 Subject: Update CHANGELOG.md for 10.1.2 [ci skip] --- CHANGELOG.md | 4 ++++ changelogs/unreleased/fix-mysql-grant-check.yml | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/fix-mysql-grant-check.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f13eca2caf..685873391eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.2 (2017-11-08) + +- [FIXED] Fix TRIGGER checks for MySQL. + ## 10.1.1 (2017-10-31) - [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu) diff --git a/changelogs/unreleased/fix-mysql-grant-check.yml b/changelogs/unreleased/fix-mysql-grant-check.yml deleted file mode 100644 index a1c1aa67d79..00000000000 --- a/changelogs/unreleased/fix-mysql-grant-check.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix TRIGGER checks for MySQL -merge_request: -author: -type: fixed -- cgit v1.2.3 From 29238cfaabf8f0fe83ddbbf83a5885df4a491b38 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 9 Nov 2017 20:52:19 +0000 Subject: Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable' Add 10.1.2 security fixes to CHANGELOG.md See merge request gitlab-org/gitlab-ce!15302 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 685873391eb..2482f0124bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ entry. ## 10.1.2 (2017-11-08) +- [SECURITY] Add X-Content-Type-Options header in API responses to make it more difficult to find other vulnerabilities. +- [SECURITY] Properly translate IP addresses written in decimal, octal, or other formats in SSRF protections in project imports. - [FIXED] Fix TRIGGER checks for MySQL. ## 10.1.1 (2017-10-31) -- cgit v1.2.3