From ef057bab4344a3bf9c61e1d8d8a73ba098ce7a76 Mon Sep 17 00:00:00 2001 From: Diana Stanley Date: Tue, 25 Sep 2018 00:11:35 +0000 Subject: Merge branch 'security-security-2697-code-highlight-timeout-11-1' into 'security-11-1' [11.1] Fix syntax highlight taking too long See merge request gitlab/gitlabhq!2485 --- changelogs/unreleased/security-2697-code-highlight-timeout.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/security-2697-code-highlight-timeout.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/security-2697-code-highlight-timeout.yml b/changelogs/unreleased/security-2697-code-highlight-timeout.yml new file mode 100644 index 00000000000..66ad9ff822b --- /dev/null +++ b/changelogs/unreleased/security-2697-code-highlight-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Set timeout for syntax highlighting +merge_request: +author: +type: security -- cgit v1.2.1