diff options
| author | Diana Stanley <dstanley@gitlab.com> | 2018-09-25 00:11:35 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-25 09:40:15 +0200 |
| commit | ef057bab4344a3bf9c61e1d8d8a73ba098ce7a76 (patch) | |
| tree | 7525e3f7a53bf4342191d3b292b2b337c60d9847 /changelogs | |
| parent | 014912084ddfbafa35da6d52f1b1b46b601bfc62 (diff) | |
| download | gitlab-ce-ef057bab4344a3bf9c61e1d8d8a73ba098ce7a76.tar.gz | |
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
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/security-2697-code-highlight-timeout.yml | 5 |
1 files changed, 5 insertions, 0 deletions
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 |