Merged r22092 from trunk to 5.0-stable (#38239).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22093 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

@@ -49,7 +49,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark]
 # Optional CommonMark support, not for JRuby
 group :common_mark do
   gem "html-pipeline", "~> 2.13.2"
-  gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.6')
+  gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8')
   gem "sanitize", "~> 6.0"
   gem 'deckar01-task_list', '2.3.2'
 end

test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb

@@ -151,7 +151,7 @@ class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase
         <p>This is some text<sup><a href="#fn-1" id="fnref-1">1</a></sup>.</p>
          <ol>
         <li id="fn-1">
-        <p>This is the foot note <a href="#fnref-1" aria-label=\"Back to content\">↩</a></p>
+        <p>This is the foot note <a href="#fnref-1" aria-label="Back to reference 1">↩</a></p>
         </li>
         </ol>
       EXPECTED