summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-09 21:46:15 +0000
committerStan Hu <stanhu@gmail.com>2017-11-09 21:46:15 +0000
commitb60ae7b94619ac00b25ed220abda3fa1f112660d (patch)
tree869086457058955fdb2fc65361c416ba0d015eb5
parent76c4568daa809c85a8de6e2df8546ef46e6470a4 (diff)
parentd561d422dab4408291f94be9e2a3143ad8033720 (diff)
downloadgitlab-ce-9-5-stable.tar.gz
Merge branch 'mk-add-security-fixes-to-changelog-9-5-stable' into '9-5-stable'9-5-stable
Add 9.5.10 security fixes to CHANGELOG.md See merge request gitlab-org/gitlab-ce!15304
-rw-r--r--CHANGELOG.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86a180cb24d..f68a0037aa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ entry.
## 9.5.10 (2017-11-08)
-- No changes.
+- [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.
## 9.5.9 (2017-10-16)