diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 16:48:00 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 16:48:00 +0000 |
| commit | 7cb9957a33d37394cd884106865e4aedef519e97 (patch) | |
| tree | f7eb746219c254d0bd0e139a0a382d5baf9aed2c /changelogs | |
| parent | bfd3062cd3479beedb327e8fed04767f52c5c135 (diff) | |
| parent | 3bfc08be9130fef1f07462d543d559f5c7f533a6 (diff) | |
| download | gitlab-ce-7cb9957a33d37394cd884106865e4aedef519e97.tar.gz | |
Merge branch 'security-2697-code-highlight-timeout' into 'master'
[master] Fix syntax highlight taking too long
Closes #2697
See merge request gitlab/gitlabhq!2467
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 |