Commit 64e72af3 authored by Marin Jankovski's avatar Marin Jankovski

Replace apostrophe with right single quote to avoid markdown interpretation as issue 39.

parent 099cf355
...@@ -10,6 +10,11 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML ...@@ -10,6 +10,11 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
super options super options
end end
def normal_text(text)
return text unless text.present?
text.gsub("'", "&rsquo;")
end
def block_code(code, language) def block_code(code, language)
# New lines are placed to fix an rendering issue # New lines are placed to fix an rendering issue
# with code wrapped inside <h1> tag for next case: # with code wrapped inside <h1> tag for next case:
......
...@@ -535,7 +535,7 @@ describe GitlabMarkdownHelper do ...@@ -535,7 +535,7 @@ describe GitlabMarkdownHelper do
project.issues.stub(:where).with(iid: '39').and_return([issue]) project.issues.stub(:where).with(iid: '39').and_return([issue])
actual = "Yes, it is @#{member.user.username}'s task." actual = "Yes, it is @#{member.user.username}'s task."
expected = /Yes, it is <a.+>@#{member.user.username}<\/a>'s task/ expected = /Yes, it is <a.+>@#{member.user.username}<\/a>s task/
markdown(actual).should match(expected) markdown(actual).should match(expected)
end end
...@@ -566,7 +566,7 @@ describe GitlabMarkdownHelper do ...@@ -566,7 +566,7 @@ describe GitlabMarkdownHelper do
it "should leave inline code untouched" do it "should leave inline code untouched" do
markdown("\nDon't use `$#{snippet.id}` here.\n").should == markdown("\nDon't use `$#{snippet.id}` here.\n").should ==
"<p>Don't use <code>$#{snippet.id}</code> here.</p>\n" "<p>Dont use <code>$#{snippet.id}</code> here.</p>\n"
end end
it "should leave ref-like autolinks untouched" do it "should leave ref-like autolinks untouched" 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