diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-09-12 13:50:08 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-13 18:28:03 +0200 |
commit | 831c94751313d78165daa6f63823988141aa9d5e (patch) | |
tree | 03f9dc122ab42a1658b492e0d4319b32df49d5e6 | |
parent | ecf71e688481072eb95d1b060e303b07bae3407f (diff) | |
download | gitlab-ce-831c94751313d78165daa6f63823988141aa9d5e.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.lock | 2 | ||||
-rw-r--r-- | spec/lib/banzai/filter/markdown_filter_spec.rb | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3dce80deb87..e41719ec79d 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 a515d07b072..f4149036e1a 100644 --- a/spec/lib/banzai/filter/markdown_filter_spec.rb +++ b/spec/lib/banzai/filter/markdown_filter_spec.rb @@ -60,4 +60,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 |