From: Go MAEDA <maeda@farend.jp>
Date: Fri, 18 Dec 2020 05:13:58 +0000 (+0000)
Subject: Merged r18353 from trunk to 4.0-stable (#34461).
X-Git-Tag: 4.0.8~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=127e2dd03b9a834c035855b0c3f8579f3d0c52d5;p=redmine.git

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 c36c26288..37e94e3b7 100644
--- 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 cfe8188f6..7f240ecc2 100644
--- 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>