Project

General

Profile

Actions

Patch #31556

closed

Update Rouge to 3.12.0

Added by Marius BĂLTEANU almost 5 years ago. Updated over 4 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Category:
Gems support
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:


Files

0001-Update-rouge-to-3.4.0.patch (602 Bytes) 0001-Update-rouge-to-3.4.0.patch Marius BĂLTEANU, 2019-06-12 08:20
0001-Update-rouge-to-3.4.1.patch (602 Bytes) 0001-Update-rouge-to-3.4.1.patch Marius BĂLTEANU, 2019-06-13 09:07
31556-update-test.patch (1004 Bytes) 31556-update-test.patch Go MAEDA, 2019-06-13 09:19
0001-Bump-rouge-to-3.7.0.patch (599 Bytes) 0001-Bump-rouge-to-3.7.0.patch Marius BĂLTEANU, 2019-08-04 21:45
Actions #2

Updated by Marius BĂLTEANU almost 5 years ago

Actions #3

Updated by Go MAEDA almost 5 years ago

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?

Actions #4

Updated by Marius BĂLTEANU almost 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.

Actions #5

Updated by Go MAEDA almost 5 years ago

  • Target version changed from 4.2.0 to 4.1.0

Setting the target version to 4.1.0.

Actions #6

Updated by Go MAEDA almost 5 years ago

  • Status changed from New to Closed
  • Assignee set to Go MAEDA

Committed the patch. Thanks.

Actions #7

Updated by Go MAEDA almost 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" 
Actions #8

Updated by Go MAEDA almost 5 years ago

  • Status changed from Reopened to Closed

Updated Rouge to 3.5.1 in r18319.

Actions #9

Updated by Marius BĂLTEANU over 4 years ago

Actions #10

Updated by Go MAEDA over 4 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.

Actions #11

Updated by Go MAEDA over 4 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|
Actions #12

Updated by Go MAEDA over 4 years ago

  • Status changed from Reopened to Closed

Updated Rouge to 3.8.0 in r18369.

Actions #13

Updated by Go MAEDA over 4 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.

Actions #14

Updated by Go MAEDA over 4 years ago

Updated Rouge to 3.10.0 in r18424.

Actions #15

Updated by Go MAEDA over 4 years ago

  • Subject changed from Update Rouge to 3.9.0 to Update Rouge to 3.10.0
Actions #16

Updated by Go MAEDA over 4 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.

Actions #17

Updated by Go MAEDA over 4 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.

Actions

Also available in: Atom PDF