summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine.rb5
-rw-r--r--lib/redmine/preparation.rb4
2 files changed, 1 insertions, 8 deletions
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