Merge branch 'rs-remove-gfm_with_options' into 'master'

Remove the `gfm_with_options` helper

It was redundant because `gfm` also took options.

See merge request !1152

2 files changed, 2 insertions, 12 deletions

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 889decc9b48..9f6e19a09fd 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -25,21 +25,11 @@ module Gitlab
     # Public: Parse the provided text with GitLab-Flavored Markdown
     #
     # text         - the source text
-    # options      - options
-    # html_options - extra options for the reference links as given to link_to
-    def gfm(text, options = {}, html_options = {})
-      gfm_with_options(text, options, html_options)
-    end
-
-    # Public: Parse the provided text with GitLab-Flavored Markdown
-    #
-    # text         - the source text
     # options      - A Hash of options used to customize output (default: {}):
     #                :xhtml               - output XHTML instead of HTML
     #                :reference_only_path - Use relative path for reference links
-    # project      - the project
     # html_options - extra options for the reference links as given to link_to
-    def gfm_with_options(text, options = {}, html_options = {})
+    def gfm(text, options = {}, html_options = {})
       return text if text.nil?
 
       # Duplicate the string so we don't alter the original, then call to_str
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 04440e4f68d..f57b56cbdf0 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -41,6 +41,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
   end
 
   def postprocess(full_document)
-    h.gfm_with_options(full_document, @options)
+    h.gfm(full_document, @options)
   end
 end