kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set Redcarpet :no_intra_emphasis to true (#16669). 

git-svn-id: http://svn.redmine.org/redmine/trunk@13105 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-04-26 07:02:45 +00:00
parent 43c9d69bf2
commit d197203d79
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/wiki_formatting/markdown/formatter.rb
View File

@ -127,7 +127,8 @@ module Redmine
:space_after_headers => true, :space_after_headers => true,
:tables => true, :tables => true,
:strikethrough => true, :strikethrough => true,
:superscript => true :superscript => true,
:no_intra_emphasis => true
) )
end end
end end

4
test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb
View File

@ -28,6 +28,10 @@ class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip
end end
def test_not_set_intra_emphasis
assert_equal "<p>foo_bar_baz</p>", @formatter.new("foo_bar_baz").to_html.strip
end
def test_wiki_links_should_be_preserved def test_wiki_links_should_be_preserved
text = 'This is a wiki link: [[Foo]]' text = 'This is a wiki link: [[Foo]]'
assert_include '[[Foo]]', @formatter.new(text).to_html assert_include '[[Foo]]', @formatter.new(text).to_html