summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-13 22:38:30 +0000
committerMark Fletcher <mark@gitlab.com>2018-03-16 11:35:44 +0000
commit2655d95d87a7f46029248062514daa3de2efde9b (patch)
treedf07573750b19dcaa6b4256cf822297e253f31d0 /changelogs
parentb825ba005e9be92c3e55ef68cdb3894732765f14 (diff)
downloadgitlab-ce-2655d95d87a7f46029248062514daa3de2efde9b.tar.gz
Merge branch 'fj-15329-services-callbacks-ssrf-10-3' into 'security-10-3'
[10.3] Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2346
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