summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 07:42:06 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 07:42:06 +0000
commitf25dd0487614b5bfe06bca714c29ba8e24dbbd40 (patch)
treee36712ad9036a96a4a648bd28d35c2ea1ff74121 /changelogs
parentb8691913ca7cd358cac48fa68d0bea38753f9dd2 (diff)
parentf74659bb4ba41eec05b253bf13938daaf7da2ad3 (diff)
downloadgitlab-ce-f25dd0487614b5bfe06bca714c29ba8e24dbbd40.tar.gz
Merge branch 'security-fix_jira_ssrf_vulnerability-12-0' into '12-0-stable'
Fix DNS rebind vulnerability for JIRA integration See merge request gitlab/gitlabhq!3312
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/security-fix_jira_ssrf_vulnerability.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-fix_jira_ssrf_vulnerability.yml b/changelogs/unreleased/security-fix_jira_ssrf_vulnerability.yml
new file mode 100644
index 00000000000..25518dd2d05
--- /dev/null
+++ b/changelogs/unreleased/security-fix_jira_ssrf_vulnerability.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent DNS rebind on JIRA service integration
+merge_request:
+author:
+type: security