summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-11-10 16:08:57 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-11-10 16:08:57 +0800
commitc64effb426d9984bc94b74d815507debdf281993 (patch)
treeefc78a9e42ea86f75f004d91688e9548e0048e03
parentc28104196bab906362945ad38c01942dcb8ad2d2 (diff)
parent3dfbf17765a60b849dd59f5c8af6c2f3bb7f3739 (diff)
downloadgitlab-ce-c64effb426d9984bc94b74d815507debdf281993.tar.gz
Merge branch '10-1-stable' into 10-1-stable-patch-2
* 10-1-stable: Add 10.1.2 security fixes to CHANGELOG.md
-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)