diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-15 21:16:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-15 21:16:42 +0000 |
| commit | 3ae42cb32617670cb6c99a60f5cda2cf961d110c (patch) | |
| tree | 2348af8e781435538aed5517b0c2087432b42c78 /lib/redmine.rb | |
| parent | 7fb35abd10e3da24188f0f4325d4ba001687ebac (diff) | |
| download | redmine-3ae42cb32617670cb6c99a60f5cda2cf961d110c.tar.gz redmine-3ae42cb32617670cb6c99a60f5cda2cf961d110c.zip | |
Better handle html-only emails (#16962).
git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine.rb')
| -rw-r--r-- | lib/redmine.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb index 6e3149dea..e00d089f5 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -267,11 +267,8 @@ Redmine::Search.map do |search| end Redmine::WikiFormatting.map do |format| - format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper - if Object.const_defined?(:Redcarpet) - format.register :markdown, Redmine::WikiFormatting::Markdown::Formatter, Redmine::WikiFormatting::Markdown::Helper, - :label => 'Markdown' - end + format.register :textile + format.register :markdown if Object.const_defined?(:Redcarpet) end ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler |