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 @@ -98,6 +98,10 @@ cfscript CFScript, the CFML scripting language [aliases: cfc] + + cisco_ios + Cisco IOS configuration lexer + clean The Clean programming language (clean.cs.ru.nl) 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 RAW expected = <<~EXPECTED -
/* Hello */document.write("Hello World!");
+
/* Hello */document.write("Hello World!");
EXPECTED with_settings :text_formatting => 'textile' do assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')