Merged r18353 from trunk to 4.0-stable (#34461).

This merge is intended to update Redcarpet from 3.4 to 3.5 before merging r20665 which updates Redcarpet to 3.5.1.

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20667 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index c36c262889832bb6248176d153a8623daa7306a5..37e94e3b766da0e6c2ab1d076a7461865e1dcef1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ platforms :mri, :mingw, :x64_mingw do
 
   # Optional Markdown support, not for JRuby
   group :markdown do
-    gem "redcarpet", "~> 3.4.0"
+    gem "redcarpet", "~> 3.5.0"
   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 cfe8188f66668d9d5699dadd8c3ce6c3da4d13e3..7f240ecc2d1fdf3e303b7c2fa578a82396766723 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
@@ -106,13 +106,13 @@ This is some text[^1].
 STR
 
     expected = <<-EXPECTED
-<p>This is some text<sup id="fnref1"><a href="#fn1" rel="footnote">1</a></sup>.</p>
+<p>This is some text<sup id="fnref1"><a href="#fn1">1</a></sup>.</p>
 <div class="footnotes">
 <hr>
 <ol>
 
 <li id="fn1">
-<p>This is the foot note&nbsp;<a href="#fnref1" rev="footnote">&#8617;</a></p>
+<p>This is the foot note&nbsp;<a href="#fnref1">&#8617;</a></p>
 </li>
 
 </ol>