summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-05-17 21:12:03 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-05-17 21:12:03 +0000
commitd2ed02daeff795f5bbe15d828f95e6d4b7928071 (patch)
tree2dcf633e7a5449adec1996b6b996c9f62fe1ca7b
parent75124f407664b0efebfa736564acb47c44068538 (diff)
downloadredmine-d2ed02daeff795f5bbe15d828f95e6d4b7928071.tar.gz
redmine-d2ed02daeff795f5bbe15d828f95e6d4b7928071.zip
Remove experimental flag from CommonMark text formatter (#36807).
git-svn-id: https://svn.redmine.org/redmine/trunk@21594 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
-rw-r--r--lib/redmine/preparation.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index e524131b6..b25fdb5a1 100644
--- 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 2ba3b5447..79f4f82ee 100644
--- 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