From b0b271283d02bf0c878433dac5c90cbba7ee5ed6 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 31 Mar 2018 05:31:54 +0000 Subject: Merged r17198 to 3.3-stable (#28119). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17248 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/wiki_formatting/markdown/formatter.rb | 3 ++- test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb index bfb04774c..2721adf3d 100644 --- a/lib/redmine/wiki_formatting/markdown/formatter.rb +++ b/lib/redmine/wiki_formatting/markdown/formatter.rb @@ -138,7 +138,8 @@ module Redmine :strikethrough => true, :superscript => true, :no_intra_emphasis => true, - :footnotes => true + :footnotes => true, + :lax_spacing => true ) end end diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb index 77dd93c7d..5ad67f431 100644 --- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb @@ -89,5 +89,14 @@ STR assert_equal '

This is a link

', @formatter.new(text).to_html.strip end + def test_markdown_should_not_require_surrounded_empty_line + text = <<-STR +This is a list: +* One +* Two +STR + assert_equal "

This is a list:

\n\n", @formatter.new(text).to_html.strip + end + end end -- cgit v1.2.3