Remove the `gfm_with_options` helper
It was redundant because `gfm` also took options.
This commit is contained in:
parent
7d1c06793e
commit
907860ed3d
|
@ -22,24 +22,14 @@ module Gitlab
|
|||
autoload :TaskListFilter, 'gitlab/markdown/task_list_filter'
|
||||
autoload :UserReferenceFilter, 'gitlab/markdown/user_reference_filter'
|
||||
|
||||
# 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -15,7 +15,7 @@ require 'erb'
|
|||
# -> `markdown` helper
|
||||
# -> Redcarpet::Render::GitlabHTML converts Markdown to HTML
|
||||
# -> Post-process HTML
|
||||
# -> `gfm_with_options` helper
|
||||
# -> `gfm` helper
|
||||
# -> HTML::Pipeline
|
||||
# -> SanitizationFilter
|
||||
# -> Other filters, depending on pipeline
|
||||
|
@ -179,7 +179,7 @@ describe 'GitLab Markdown', feature: true do
|
|||
before(:all) do
|
||||
@feat = MarkdownFeature.new
|
||||
|
||||
# `gfm_with_options` depends on a `@project` variable
|
||||
# `gfm` helper depends on a `@project` variable
|
||||
@project = @feat.project
|
||||
|
||||
@html = markdown(@feat.raw_markdown)
|
||||
|
|
Loading…
Reference in New Issue