From 187aae9e275bfeff94081e1a5a9b19fa280d7523 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 5 Feb 2023 05:12:23 +0000 Subject: [PATCH] Merged r22092 from trunk to 5.0-stable (#38239). git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22093 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 2 +- .../lib/redmine/wiki_formatting/common_mark/formatter_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 5e885a3d8..23ac8c4a1 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark] # Optional CommonMark support, not for JRuby group :common_mark do gem "html-pipeline", "~> 2.13.2" - gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.6') + gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') gem "sanitize", "~> 6.0" gem 'deckar01-task_list', '2.3.2' end diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb index b5c768d44..e259032c4 100644 --- a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb @@ -151,7 +151,7 @@ class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase

This is some text1.

  1. -

    This is the foot note

    +

    This is the foot note

EXPECTED