diff options
| -rw-r--r-- | doc/markdown/markdown.md | 23 | ||||
| -rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 9 |
2 files changed, 31 insertions, 1 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index ccf44652b5b..b23e0f3e265 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -27,8 +27,9 @@ Table of Contents [Inline HTML](#toc_25) [Horizontal Rule](#toc_26) [Line Breaks](#toc_27) +[Tables](#toc_28) -[References](#toc_28) +[References](#toc_29) --------------------- ---------------------------------------------- @@ -440,6 +441,26 @@ This line is separated from the one above by two newlines, so it will be a *sepa This line is also begins a separate paragraph, but... This line is only separated by a single newline, so it's a separate line in the *same paragraph*. + +## Tables + +Tables aren't part of the core Markdown spec, but they are part of GFM and Markdown Here supports them. + +``` +| header 1 | header 2 | +| -------- | -------- | +| cell 1 | cell 2 | +| cell 3 | cell 4 | +``` + +Code above produces next output: + +| header 1 | header 2 | +| -------- | -------- | +| cell 1 | cell 2 | +| cell 3 | cell 4 | + + ------------ <a name="references"/> diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index a4db8b4ff7e..d49247accc2 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -366,6 +366,15 @@ describe GitlabMarkdownHelper do markdown(actual).should match(%r{Apply <em><a.+>!#{merge_request.iid}</a></em>}) end + it "should handle tables" do + actual = %Q{| header 1 | header 2 | +| -------- | -------- | +| cell 1 | cell 2 | +| cell 3 | cell 4 |} + + markdown(actual).should match(/\A<table/) + end + it "should leave code blocks untouched" do helper.stub(:user_color_scheme_class).and_return(:white) |