Skip to content
Snippets Groups Projects
Commit 29300418 authored by Robert Speicher's avatar Robert Speicher
Browse files

Make sure the `gfm` helper passes the required options

This adds some duplication, but this helper is temporary.
parent c104f4d5
No related branches found
No related tags found
1 merge request!1223Decouple Gitlab::Markdown from the GitlabMarkdownHelper
Pipeline #
Loading
@@ -52,7 +52,7 @@ module GitlabMarkdownHelper
Loading
@@ -52,7 +52,7 @@ module GitlabMarkdownHelper
path: @path, path: @path,
project: @project, project: @project,
project_wiki: @project_wiki, project_wiki: @project_wiki,
ref: @ref, ref: @ref
) )
   
Gitlab::Markdown.render(text, context) Gitlab::Markdown.render(text, context)
Loading
@@ -61,6 +61,14 @@ module GitlabMarkdownHelper
Loading
@@ -61,6 +61,14 @@ module GitlabMarkdownHelper
# TODO (rspeicher): Remove all usages of this helper and just call `markdown` # TODO (rspeicher): Remove all usages of this helper and just call `markdown`
# with a custom pipeline depending on the content being rendered # with a custom pipeline depending on the content being rendered
def gfm(text, options = {}) def gfm(text, options = {})
options.merge!(
current_user: current_user,
path: @path,
project: @project,
project_wiki: @project_wiki,
ref: @ref
)
Gitlab::Markdown.gfm(text, options) Gitlab::Markdown.gfm(text, options)
end end
   
Loading
Loading
Loading
@@ -77,7 +77,7 @@ describe "GitLab Flavored Markdown", feature: true do
Loading
@@ -77,7 +77,7 @@ describe "GitLab Flavored Markdown", feature: true do
it "should render details in issues#show" do it "should render details in issues#show" do
visit namespace_project_issue_path(project.namespace, project, @issue) visit namespace_project_issue_path(project.namespace, project, @issue)
   
expect(page).to have_link("@#{fred.username}") expect(page).to have_link(fred.to_reference)
end end
end end
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment