summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-09-12 13:50:08 +0000
committerDouwe Maan <douwe@gitlab.com>2018-09-12 13:50:08 +0000
commitd12c81cc5a5bc59c6f4d18fb49bc19ac2f4fb9e1 (patch)
treeb478caeb41d697ef183f74dba4ac86ed9f73a6a4
parent9f7844e25659fe1e433c0bc5ec8eb9e96e77f223 (diff)
parent0b9365b6ef45285d59a4bb7ab12d5c44723aa9c8 (diff)
downloadgitlab-ce-d12c81cc5a5bc59c6f4d18fb49bc19ac2f4fb9e1.tar.gz
Merge branch '51200-markdown-footnotes-don-t-render-when-inside-a-table' into 'master'
Resolve "Markdown footnotes don't render when inside a table..." Closes #51200 See merge request gitlab-org/gitlab-ce!21675
-rw-r--r--Gemfile.lock2
-rw-r--r--spec/lib/banzai/filter/markdown_filter_spec.rb17
2 files changed, 18 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c545b7257c..0832fe25711 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
- commonmarker (0.17.8)
+ commonmarker (0.17.13)
ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
diff --git a/spec/lib/banzai/filter/markdown_filter_spec.rb b/spec/lib/banzai/filter/markdown_filter_spec.rb
index 5cf9e698375..cf49249756a 100644
--- a/spec/lib/banzai/filter/markdown_filter_spec.rb
+++ b/spec/lib/banzai/filter/markdown_filter_spec.rb
@@ -66,4 +66,21 @@ describe Banzai::Filter::MarkdownFilter do
end
end
end
+
+ describe 'footnotes in tables' do
+ it 'processes footnotes in table cells' do
+ text = <<-MD.strip_heredoc
+ | Column1 |
+ | --------- |
+ | foot [^1] |
+
+ [^1]: a footnote
+ MD
+
+ result = filter(text)
+
+ expect(result).to include('<td>foot <sup')
+ expect(result).to include('<section class="footnotes">')
+ end
+ end
end