summaryrefslogtreecommitdiff
path: root/app/helpers/gitlab_markdown_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-27 15:36:56 -0700
committerRobert Speicher <rspeicher@gmail.com>2015-08-27 15:36:56 -0700
commit62117becb9212e3df296be2babc77cd5ac6194d2 (patch)
tree78f0d3bbe6a3c0430bce5f91ecbd5ed1c655e1b2 /app/helpers/gitlab_markdown_helper.rb
parent8e7111f79de43ea5c8471f3e0bf6ac0c76dd3117 (diff)
downloadgitlab-ce-62117becb9212e3df296be2babc77cd5ac6194d2.tar.gz
Add a temporary `gfm` helper that just delegates to `markdown`
Some views are still calling `gfm` directly. We'll need to update them to instead call `markdown` with a `pipeline: ...` argument.
Diffstat (limited to 'app/helpers/gitlab_markdown_helper.rb')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 924e6cb1979..d7843a70c72 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -58,6 +58,12 @@ module GitlabMarkdownHelper
Gitlab::Markdown.render(text, context)
end
+ # TODO (rspeicher): Remove all usages of this helper and just call `markdown`
+ # with a custom pipeline depending on the content being rendered
+ def gfm(text, options = {})
+ markdown(text, options)
+ end
+
def asciidoc(text)
Gitlab::Asciidoc.render(text, {
commit: @commit,