diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-29 17:17:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-29 17:17:20 +0000 |
| commit | 1a6d886e0dacb7391a1cb45f18747f1d2ab7723c (patch) | |
| tree | 917c3cea2aa5366eec54cb033ffe4af64ba48187 | |
| parent | 5d5e74676741a45fe49bb99ec09aec608fb05db3 (diff) | |
| parent | 5f2e8b6147eecc8f9a946b4e964bbb99b676ec58 (diff) | |
| download | gitlab-ce-1a6d886e0dacb7391a1cb45f18747f1d2ab7723c.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 909f9972712..ecffcb5262c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 7.11.0 (unreleased) - Improve UI for mobile phones on dashboard and project pages - Add room notification and message color option for HipChat - 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 - Ignore submodules that are defined in .gitmodules but are checked in as directories. diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index aff7011edd0..bc234500000 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -49,7 +49,8 @@ module GitlabMarkdownHelper strikethrough: true, lax_spacing: true, space_after_headers: true, - superscript: true + superscript: true, + footnotes: true ) end |