Patch #31556
closedUpdate Rouge to 3.12.0
Description
Files
Updated by Marius BĂLTEANU over 5 years ago
There is a failing test: https://gitlab.com/redmine-org/redmine/-/jobs/229555710
Updated by Marius BĂLTEANU over 5 years ago
- File 0001-Update-rouge-to-3.4.1.patch 0001-Update-rouge-to-3.4.1.patch added
- Subject changed from Update Rouge to 3.4.0 to Update Rouge to 3.4.1
Same fail with 3.4.1: https://gitlab.com/redmine-org/redmine/-/jobs/230187783
Updated by Go MAEDA over 5 years ago
- File 31556-update-test.patch 31556-update-test.patch added
This is due to the change https://github.com/rouge-ruby/rouge/pull/1165/. Rouge changed the CSS class for quotation marks in 3.4.0, so we can simply update the test.
By the way, how about delivering this in 4.1.0 instead of 4.2.0?
Updated by Marius BĂLTEANU over 5 years ago
Go MAEDA wrote:
This is due to the change https://github.com/rouge-ruby/rouge/pull/1165/. Rouge changed the CSS class for quotation marks in 3.4.0, so we can simply update the test.
By the way, how about delivering this in 4.1.0 instead of 4.2.0?
Now that 3.4.1 is out with a hot fix, I think it is safe.
Updated by Go MAEDA over 5 years ago
- Target version changed from 4.2.0 to 4.1.0
Setting the target version to 4.1.0.
Updated by Go MAEDA over 5 years ago
- Status changed from New to Closed
- Assignee set to Go MAEDA
Committed the patch. Thanks.
Updated by Go MAEDA over 5 years ago
- Subject changed from Update Rouge to 3.4.1 to Update Rouge to 3.5.1
- Status changed from Closed to Reopened
Rouge 3.5.1 has been released on July 25th.
It passed all the tests. I think we can update Rouge to 3.5.1.
diff --git a/Gemfile b/Gemfile
index ecd3bd150..4b7350e40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
gem "rails", "5.2.3"
-gem "rouge", "~> 3.4.1"
+gem "rouge", "~> 3.5.1"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
gem "actionpack-xml_parser"
Updated by Go MAEDA over 5 years ago
- Status changed from Reopened to Closed
Updated Rouge to 3.5.1 in r18319.
Updated by Marius BĂLTEANU over 5 years ago
- File 0001-Bump-rouge-to-3.7.0.patch 0001-Bump-rouge-to-3.7.0.patch added
- Subject changed from Update Rouge to 3.5.1 to Update Rouge to 3.7.0
- Status changed from Closed to Reopened
Rouge 3.6.0 and 3.7.0 Changelog: https://github.com/rouge-ruby/rouge/blob/master/README.md
Tests pass: https://gitlab.com/redmine-org/redmine/pipelines/74619202
Updated by Go MAEDA over 5 years ago
- Status changed from Reopened to Closed
Marius BALTEANU wrote:
Rouge 3.6.0 and 3.7.0 Changelog: https://github.com/rouge-ruby/rouge/blob/master/README.md
Tests pass: https://gitlab.com/redmine-org/redmine/pipelines/74619202
Committed the patch. Thanks.
Updated by Go MAEDA over 5 years ago
- Subject changed from Update Rouge to 3.7.0 to Update Rouge to 3.8.0
- Status changed from Closed to Reopened
Rouge 3.8.0 has been released on 2019-08-07.
https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-380-2019-08-07
diff --git a/Gemfile b/Gemfile
index 4dc35ee83..e7ba3f4ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
gem "rails", "5.2.3"
-gem "rouge", "~> 3.7.0"
+gem "rouge", "~> 3.8.0"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
gem "actionpack-xml_parser"
diff --git a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
index 16387966c..7df35ca64 100644
--- a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
+++ b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
@@ -24,7 +24,7 @@ class Redmine::SyntaxHighlighting::RougeTest < ActiveSupport::TestCase
to_test = {
'application.js' => true,
'Gemfile' => true,
- 'AUTOEXEC.BAT' => false, # Rouge does not support BAT files
+ 'HELLO.CBL' => false, # Rouge does not support COBOL
'HELLO.C' => true
}
to_test.each do |filename, expected|
Updated by Go MAEDA over 5 years ago
- Status changed from Reopened to Closed
Updated Rouge to 3.8.0 in r18369.
Updated by Go MAEDA over 5 years ago
- Subject changed from Update Rouge to 3.8.0 to Update Rouge to 3.9.0
Updated Rouge to 3.9.0 in r18382.
Updated by Go MAEDA over 5 years ago
- Subject changed from Update Rouge to 3.9.0 to Update Rouge to 3.10.0
Updated by Go MAEDA over 5 years ago
- Subject changed from Update Rouge to 3.10.0 to Update Rouge to 3.11.0
Updated Rouge to 3.11.0 in r18482.
Updated by Go MAEDA about 5 years ago
- Subject changed from Update Rouge to 3.11.0 to Update Rouge to 3.12.0
Updated Rouge to 3.12.0 in r18710.