Remove experimental flag from CommonMark text formatter (#36807).

git-svn-id: https://svn.redmine.org/redmine/trunk@21594 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index e524131b615a347b081666bcfb3ecf3cb6f7b8cc..b25fdb5a19f433967b9879783bb45503ead494bc 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ end
 
 # Optional Markdown support, not for JRuby
 # ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details.
-gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark]
+gem 'redcarpet', '~> 3.5.1', groups: [:markdown]
 
 # Optional CommonMark support, not for JRuby
 group :common_mark do

diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb
index 2ba3b5447f9c2c7951d1312a97394a18100ddf99..79f4f82eec4b99bd4b6c98dc0d959d4324c5542b 100644 (file)
--- a/lib/redmine/preparation.rb
+++ b/lib/redmine/preparation.rb
@@ -397,7 +397,7 @@ module Redmine
         format.register :textile
         format.register :markdown if Object.const_defined?(:Redcarpet)
         if Object.const_defined?(:CommonMarker)
-          format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored) - experimental'
+          format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)'
         end
       end