Commit 5733bdb7 authored by Robert Speicher's avatar Robert Speicher

Fix link_to_gfm with only a reference having the incorrect link

Closes #1721
parent 51888f74
require 'nokogiri'
module GitlabMarkdownHelper module GitlabMarkdownHelper
include Gitlab::Markdown include Gitlab::Markdown
...@@ -21,11 +23,22 @@ module GitlabMarkdownHelper ...@@ -21,11 +23,22 @@ module GitlabMarkdownHelper
gfm_body = gfm(escaped_body, {}, html_options) gfm_body = gfm(escaped_body, {}, html_options)
gfm_body.gsub!(%r{<a.*?>.*?</a>}m) do |match| fragment = Nokogiri::XML::DocumentFragment.parse(gfm_body)
"</a>#{match}#{link_to("", url, html_options)[0..-5]}" # "</a>".length +1 if fragment.children.size == 1 && fragment.children[0].name == 'a'
# Fragment has only one node, and it's a link generated by `gfm`.
# Replace it with our requested link.
text = fragment.children[0].text
fragment.children[0].replace(link_to(text, url, html_options))
else
# Traverse the fragment's first generation of children looking for pure
# text, wrapping anything found in the requested link
fragment.children.each do |node|
next unless node.text?
node.replace(link_to(node.text, url, html_options))
end
end end
link_to(gfm_body.html_safe, url, html_options) fragment.to_html.html_safe
end end
def markdown(text, options={}) def markdown(text, options={})
......
...@@ -94,6 +94,12 @@ describe GitlabMarkdownHelper do ...@@ -94,6 +94,12 @@ describe GitlabMarkdownHelper do
expect(link_to_gfm(actual, commit_path)). expect(link_to_gfm(actual, commit_path)).
to match('&lt;h1&gt;test&lt;/h1&gt;') to match('&lt;h1&gt;test&lt;/h1&gt;')
end end
it 'ignores reference links when they are the entire body' do
text = issues[0].to_reference
act = link_to_gfm(text, '/foo')
expect(act).to eq %Q(<a href="/foo">#{issues[0].to_reference}</a>)
end
end end
describe '#render_wiki_content' do describe '#render_wiki_content' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment