summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-09 20:52:19 +0000
committerMichael Kozono <mkozono@gmail.com>2017-11-09 13:03:53 -0800
commit29238cfaabf8f0fe83ddbbf83a5885df4a491b38 (patch)
tree9ea88e9298314019926b13e1457a4d90346294d8
parent6925477687acf32fdd6add29cbd9dbacbab04f48 (diff)
downloadgitlab-ce-29238cfaabf8f0fe83ddbbf83a5885df4a491b38.tar.gz
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
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
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)