diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-09-24 18:43:51 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-24 18:59:29 +0300 |
| commit | aa76a86217e490b8acd1fa61d72b2a73ecc3d813 (patch) | |
| tree | 26325a73c0d056617cde3dc754adc3710b49c0c5 /changelogs | |
| parent | 06cbee3bf9dd960380390c0a5df9b67a52a85ba9 (diff) | |
Merge branch 'security-security-2697-code-highlight-timeout-11-2' into 'security-11-2'
[11.2] Fix syntax highlight taking too long
See merge request gitlab/gitlabhq!2484
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 |