Commit 1a6d886e authored by Douwe Maan's avatar Douwe Maan

Merge branch 'footnotes-markdown' into 'master'

Add footnotes support to Markdown

This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555

See merge request !572
parents 5d5e7467 5f2e8b61
...@@ -29,6 +29,7 @@ v 7.11.0 (unreleased) ...@@ -29,6 +29,7 @@ v 7.11.0 (unreleased)
- Improve UI for mobile phones on dashboard and project pages - Improve UI for mobile phones on dashboard and project pages
- Add room notification and message color option for HipChat - Add room notification and message color option for HipChat
- Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka) - Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka)
- Add footnotes support to Markdown (Guillaume Delbergue)
v 7.10.0 v 7.10.0
- Ignore submodules that are defined in .gitmodules but are checked in as directories. - Ignore submodules that are defined in .gitmodules but are checked in as directories.
......
...@@ -49,7 +49,8 @@ module GitlabMarkdownHelper ...@@ -49,7 +49,8 @@ module GitlabMarkdownHelper
strikethrough: true, strikethrough: true,
lax_spacing: true, lax_spacing: true,
space_after_headers: true, space_after_headers: true,
superscript: true superscript: true,
footnotes: true
) )
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment