diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 11:37:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 11:37:53 +0000 |
| commit | 468b5ccaf7a622e55549599ceb5b18220b5bf0aa (patch) | |
| tree | 1f2e3e598938ee2398aa4968fc21717c1c93816c /lib | |
| parent | eb25ac12499d70f7ebd59b64857e6901a5c32972 (diff) | |
| download | gitlab-ce-468b5ccaf7a622e55549599ceb5b18220b5bf0aa.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/blockquote_fence_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/filter/blockquote_fence_filter.rb b/lib/banzai/filter/blockquote_fence_filter.rb index 8f5ad9981e5..e07cbfe8d85 100644 --- a/lib/banzai/filter/blockquote_fence_filter.rb +++ b/lib/banzai/filter/blockquote_fence_filter.rb @@ -6,7 +6,7 @@ module Banzai REGEX = %r{ #{::Gitlab::Regex.markdown_code_or_html_blocks} | - (?: + (?=^>>>\ *\n.*\n>>>\ *$)(?: # Blockquote: # >>> # Anything, including code and HTML blocks |