meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Use Commonmarker instead of Redcarpet by default when rendering Markdown attachments (#36807, #38372).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: https://svn.redmine.org/redmine/trunk@22146 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-03-23 04:45:19 +00:00
parent 6781643871
commit 2b00670e4d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/application_helper.rb
View File

@ -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

14
test/helpers/application_helper_test.rb
View File

@ -2229,6 +2229,20 @@ class ApplicationHelperTest < Redmine::HelperTest
end
end
# TODO: Remove this test when Redcarpet-based Markdown formatter is removed
def test_markdown_formatter
[
['markdown', 'markdown'],
['common_mark', 'common_mark'],
['textile', 'common_mark'],
['', 'common_mark']
].each do |text_formatting, expected|
with_settings text_formatting: text_formatting do
assert_equal expected, markdown_formatter
end
end
end
private
def wiki_links_with_special_characters