From 444a94c7cbbfc7baff254fb36682350fb902124a Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Thu, 1 May 2025 10:28:14 +0000
Subject: [PATCH] Make commonmarker gem required to avoid runtime error
 (#37394).

Although the commonmarker gem is marked as optional in the Gemfile, Redmine fails to start without it, raising a NameError: "uninitialized constant Redmine::WikiFormatting::CommonMark::HTML". This patch makes the gem required to ensure Redmine starts correctly.


git-svn-id: https://svn.redmine.org/redmine/trunk@23734 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile                    | 6 +-----
 lib/redmine.rb             | 5 -----
 lib/redmine/preparation.rb | 4 +---
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index d08b7661c..1103c6d69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem 'propshaft', '~> 1.1.0'
 gem 'rack', '>= 3.1.3'
 gem "stimulus-rails", "~> 1.3"
 gem "importmap-rails", "~> 2.0"
+gem 'commonmarker', '~> 2.3.0'
 
 #  Ruby Standard Gems
 gem 'csv', '~> 3.3.2'
@@ -46,11 +47,6 @@ group :minimagick do
   gem 'mini_magick', '~> 5.2.0'
 end
 
-# Optional CommonMark support, not for JRuby
-group :common_mark do
-  gem "commonmarker", '~> 2.3.0'
-end
-
 # Include database gems for the adapters found in the database
 # configuration file
 database_file = File.join(File.dirname(__FILE__), "config/database.yml")
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 95b3b7f3f..78a1a6d8c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -24,11 +24,6 @@ begin
 rescue LoadError
   # MiniMagick is not available
 end
-begin
-  require 'commonmarker' unless Object.const_defined?(:Commonmarker)
-rescue LoadError
-  # CommonMarker is not available
-end
 
 module Redmine
 end
diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb
index 822662e11..a31204904 100644
--- a/lib/redmine/preparation.rb
+++ b/lib/redmine/preparation.rb
@@ -408,9 +408,7 @@ module Redmine
 
       WikiFormatting.map do |format|
         format.register :textile
-        if Object.const_defined?(:Commonmarker)
-          format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)'
-        end
+        format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)'
       end
 
       ActionView::Template.register_template_handler :rsb, Views::ApiTemplateHandler