Update Rouge to 4.1 (#37236).

git-svn-id: https://svn.redmine.org/redmine/trunk@22111 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index c1a358a1ca4d108a30c663ca2ccfd07671f6e854..b95817e1abe51a1f4cc84ed4c7393a0569a0c5a1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '>= 2.7.0', '< 3.3.0'
 
 gem 'rails', '6.1.7.2'
-gem 'rouge', '~> 4.0.0'
+gem 'rouge', '~> 4.1.0'
 gem 'request_store', '~> 1.5.0'
 gem 'mini_mime', '~> 1.1.0'
 gem "actionpack-xml_parser"

diff --git a/public/help/code_highlighting_languages.html b/public/help/code_highlighting_languages.html
index eda279942157e22dad9ffebbe8704b7caa14ca5e..4f3fe1b2d998f3398bdedad22e6fa6ca1efd4eb0 100644 (file)
--- a/public/help/code_highlighting_languages.html
+++ b/public/help/code_highlighting_languages.html
@@ -98,6 +98,10 @@
       <td>cfscript</td>
       <td>CFScript, the CFML scripting language [aliases: cfc]</td>
     </tr>
+    <tr>
+      <td>cisco_ios</td>
+      <td>Cisco IOS configuration lexer</td>
+    </tr>
     <tr>
       <td>clean</td>
       <td>The Clean programming language (clean.cs.ru.nl)</td>

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index ff62525f2f3e35004e071ab6f85b224f78aac3b0..fc0351885f281f308ad4443dd17c6a3761679ce9 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -1413,7 +1413,7 @@ class ApplicationHelperTest < Redmine::HelperTest
       </code></pre>
     RAW
     expected = <<~EXPECTED
-      <pre><code class="ECMA_script syntaxhl" data-language="ECMA_script"><span class="cm">/* Hello */</span><span class="nb">document</span><span class="p">.</span><span class="nx">write</span><span class="p">(</span><span class="dl">"</span><span class="s2">Hello World!</span><span class="dl">"</span><span class="p">);</span></code></pre>
+      <pre><code class="ECMA_script syntaxhl" data-language="ECMA_script"><span class="cm">/* Hello */</span><span class="nb">document</span><span class="p">.</span><span class="nf">write</span><span class="p">(</span><span class="dl">"</span><span class="s2">Hello World!</span><span class="dl">"</span><span class="p">);</span></code></pre>
     EXPECTED
     with_settings :text_formatting => 'textile' do
       assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')