diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 06:06:32 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 06:06:32 +0000 |
commit | 80e5134020483299c039114e76b734436f006c66 (patch) | |
tree | c01e1b0451c336f2349cc7db9c9dc317b98bed54 /lib/banzai | |
parent | 8d78e95a9c5b352fb0498ca9c46d068eb93e6e27 (diff) | |
download | gitlab-ce-80e5134020483299c039114e76b734436f006c66.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/markdown_engines/common_mark.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/banzai/filter/markdown_engines/common_mark.rb b/lib/banzai/filter/markdown_engines/common_mark.rb index d3af776db05..7be52fc497f 100644 --- a/lib/banzai/filter/markdown_engines/common_mark.rb +++ b/lib/banzai/filter/markdown_engines/common_mark.rb @@ -29,7 +29,9 @@ module Banzai # If in the future the syntax is about to be made GitHub-compatible, please, add `:GITHUB_PRE_LANG` render option below # and remove `code_block` method from `lib/banzai/renderer/common_mark/html.rb`. RENDER_OPTIONS = [ - :DEFAULT # default rendering system. Nothing special. + # as of commonmarker 0.18.0, we need to use :UNSAFE to get the same as the original :DEFAULT + # https://github.com/gjtorikian/commonmarker/pull/81 + :UNSAFE ].freeze RENDER_OPTIONS_SOURCEPOS = RENDER_OPTIONS + [ |