summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-03-23 04:45:19 +0000
committerGo MAEDA <maeda@farend.jp>2023-03-23 04:45:19 +0000
commit2b00670e4d204db24b9e38dd5e7a8d72aa7470bc (patch)
tree2054fb6aeb2f925dcdb1e6a17f9fa7ce43a54f88 /app
parent678164387152b00ff7f14ed222778ccfbf13323b (diff)
downloadredmine-2b00670e4d204db24b9e38dd5e7a8d72aa7470bc.tar.gz
redmine-2b00670e4d204db24b9e38dd5e7a8d72aa7470bc.zip
Use Commonmarker instead of Redcarpet by default when rendering Markdown attachments (#36807, #38372).
Patch by Mizuki ISHIKAWA. git-svn-id: https://svn.redmine.org/redmine/trunk@22146 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 43f32fbc7..3177d0eb7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1855,10 +1855,10 @@ module ApplicationHelper
# Returns the markdown formatter: markdown or common_mark
# ToDo: Remove this when markdown will be removed
def markdown_formatter
- if Setting.text_formatting == "common_mark"
- "common_mark"
- else
+ if Setting.text_formatting == "markdown"
"markdown"
+ else
+ "common_mark"
end
end