summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-09 20:52:19 +0000
committerStan Hu <stanhu@gmail.com>2017-11-09 20:52:19 +0000
commit3dfbf17765a60b849dd59f5c8af6c2f3bb7f3739 (patch)
treebc52086cbe71844675a60d1044dd1b2bf89c4b71
parentaf60a6ccb7196df571aed3bf6c1d09a072bad157 (diff)
parent20926391db7145da35258d11f89261a619ad3a37 (diff)
downloadgitlab-ce-3dfbf17765a60b849dd59f5c8af6c2f3bb7f3739.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 30ab05164c5..4e1ae69eb5a 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)