summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-13 22:38:25 +0000
committerJames Lopez <james@jameslopez.es>2018-03-16 16:15:05 +0100
commit2d6c50bf02f975f1d28d35580c4ab10276787093 (patch)
treed37d985e7684ddeee04ab545eb77d0f3132e2592 /changelogs
parent9a7fd873f81d1f1755a3cb4bcaa54b7fb49b6b8d (diff)
downloadgitlab-ce-2d6c50bf02f975f1d28d35580c4ab10276787093.tar.gz
Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'
Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml
new file mode 100644
index 00000000000..7fa6f6a5874
--- /dev/null
+++ b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed some SSRF vulnerabilities in services, hooks and integrations
+merge_request: 2337
+author:
+type: security