summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 07:42:21 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 07:42:21 +0000
commit65695cb7817be01f28a8ed9798aa3e773488b699 (patch)
treeaaf816ce4e6b8b98493e2fb02d087ca0cee3a39b /changelogs
parent61f449f29f4fa0753bd771fc26f2a51037b46ade (diff)
parentf3079ce3f6af91e56b84a2135fcab0a426383b5f (diff)
downloadgitlab-ce-65695cb7817be01f28a8ed9798aa3e773488b699.tar.gz
Merge branch 'security-61974-limit-issue-comment-size-12-0' into '12-0-stable'
Limit the size of issuable description and comments See merge request gitlab/gitlabhq!3272
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/security-61974-limit-issue-comment-size-2.yml5
-rw-r--r--changelogs/unreleased/security-61974-limit-issue-comment-size.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-61974-limit-issue-comment-size-2.yml b/changelogs/unreleased/security-61974-limit-issue-comment-size-2.yml
new file mode 100644
index 00000000000..962171dc6f8
--- /dev/null
+++ b/changelogs/unreleased/security-61974-limit-issue-comment-size-2.yml
@@ -0,0 +1,5 @@
+---
+title: Speed up regexp in namespace format by failing fast after reaching maximum namespace depth
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-61974-limit-issue-comment-size.yml b/changelogs/unreleased/security-61974-limit-issue-comment-size.yml
new file mode 100644
index 00000000000..6d5ef057d83
--- /dev/null
+++ b/changelogs/unreleased/security-61974-limit-issue-comment-size.yml
@@ -0,0 +1,5 @@
+---
+title: Limit the size of issuable description and comments
+merge_request:
+author:
+type: security