summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--public/help/code_highlighting_languages.html4
-rw-r--r--test/helpers/application_helper_test.rb2
3 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c1a358a1c..b95817e1a 100644
--- 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 eda279942..4f3fe1b2d 100644
--- a/public/help/code_highlighting_languages.html
+++ b/public/help/code_highlighting_languages.html
@@ -99,6 +99,10 @@
<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>
</tr>
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index ff62525f2..fc0351885 100644
--- 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]}, '')