summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-09 21:23:56 +0000
committerMichael Kozono <mkozono@gmail.com>2017-11-09 16:03:42 -0800
commitb2a5c7c40f27ec74694af6361ca68269a38ad709 (patch)
tree9e291a62c500591bcaef95728345f11c1089ff4a /CHANGELOG.md
parent078f29f6d0c584db58669bada17bf5c4e1929de0 (diff)
downloadgitlab-ce-b2a5c7c40f27ec74694af6361ca68269a38ad709.tar.gz
Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'
Add 10.1.2 security fixes to CHANGELOG on master See merge request gitlab-org/gitlab-ce!15305
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f13eca2caf..2482f0124bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
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)
- [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu)