diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-17 18:57:10 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-17 18:57:10 +0300 |
| commit | 10bd800297ee9cca53566ae3f021a73e22e2b803 (patch) | |
| tree | be87e98505a5bd17c19a7050aef95da8dc41fd0c /lib/banzai | |
| parent | 05bef3c67a06cfea6553078f6d4e3882f5d03d0e (diff) | |
| parent | fc580935ca2171d4f5628818aa4826fbce4a7261 (diff) | |
Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'master'
Include full image URL in webhooks for uploaded images
Closes #20720
See merge request gitlab-org/gitlab-ce!18109
Diffstat (limited to 'lib/banzai')
| -rw-r--r-- | lib/banzai/filter/blockquote_fence_filter.rb | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/banzai/filter/blockquote_fence_filter.rb b/lib/banzai/filter/blockquote_fence_filter.rb index fbfcd72c916..7108e828c6d 100644 --- a/lib/banzai/filter/blockquote_fence_filter.rb +++ b/lib/banzai/filter/blockquote_fence_filter.rb @@ -2,27 +2,7 @@ module Banzai module Filter class BlockquoteFenceFilter < HTML::Pipeline::TextFilter REGEX = %r{ - (?<code> - # Code blocks: - # ``` - # Anything, including `>>>` blocks which are ignored by this filter - # ``` - - ^``` - .+? - \n```\ *$ - ) - | - (?<html> - # HTML block: - # <tag> - # Anything, including `>>>` blocks which are ignored by this filter - # </tag> - - ^<[^>]+?>\ *\n - .+? - \n<\/[^>]+?>\ *$ - ) + #{::Gitlab::Regex.markdown_code_or_html_blocks} | (?: # Blockquote: |