summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-06-26 21:41:03 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-06-26 21:41:03 +0000
commit55375a154eb4eac249c95d76674b29ba7422159b (patch)
treefeca5df69d1c18433a14044623a74c4264ee08b5 /changelogs
parentdd6e07eee94fec79c052a7ec0182b4196f8db91b (diff)
parentbb82c34e7eef05cce18adf0304227daeecec6df9 (diff)
downloadgitlab-ce-55375a154eb4eac249c95d76674b29ba7422159b.tar.gz
Merge branch 'security-fp-prevent-billion-laughs-attack-12-0' into '12-0-stable'
Prevent Billion Laughs attack See merge request gitlab/gitlabhq!3146
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/security-fp-prevent-billion-laughs-attack.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-fp-prevent-billion-laughs-attack.yml b/changelogs/unreleased/security-fp-prevent-billion-laughs-attack.yml
new file mode 100644
index 00000000000..4e0cf848931
--- /dev/null
+++ b/changelogs/unreleased/security-fp-prevent-billion-laughs-attack.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent Billion Laughs attack
+merge_request:
+author:
+type: security