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

Merge branch 'footnotes-markdown' into 'master'
1a6d886e · Douwe Maan · 5d5e7467 · 5f2e8b61 · 1a6d886e · 1a6d886e
Commit 1a6d886e authored Apr 29, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

gitlab_markdown_helper.rb app/helpers/gitlab_markdown_helper.rb +2 -1

No files found.
--- 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.

--- 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