diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-18 20:14:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-18 20:14:31 +0000 |
| commit | 2e350216cdf56c00a84d0be93b64f3db2f4d9cff (patch) | |
| tree | 0b63b46b2e5521a45cf521fe36a498c034d123ce /lib | |
| parent | 076ab2e8e09f23d138d462ad52d19ab44fb0014b (diff) | |
| parent | 1b530f96645b738c8e723f6ff8841569ac06aef4 (diff) | |
| download | gitlab-ce-2e350216cdf56c00a84d0be93b64f3db2f4d9cff.tar.gz | |
Merge branch 'fix-double-brackets-in-wiki-markdown' into 'master'
Fix double brackets being linkified in wiki markdown
See merge request gitlab-org/gitlab-ce!18524
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/gollum_tags_filter.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/banzai/filter/gollum_tags_filter.rb b/lib/banzai/filter/gollum_tags_filter.rb index f2e9a5a1116..4bc82ecb4d6 100644 --- a/lib/banzai/filter/gollum_tags_filter.rb +++ b/lib/banzai/filter/gollum_tags_filter.rb @@ -58,6 +58,9 @@ module Banzai def call doc.search(".//text()").each do |node| + # Do not perform linking inside <code> blocks + next unless node.ancestors('code').empty? + # A Gollum ToC tag is `[[_TOC_]]`, but due to MarkdownFilter running # before this one, it will be converted into `[[<em>TOC</em>]]`, so it # needs special-case handling |