Commit 9884b4db authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '36787-upgrade-commonmarker-gem-to-0-20-1' into 'master'

Upgrade `commonmarker` gem to `0.20.1`

See merge request gitlab-org/gitlab!20418
parents 5fad8112 f43ad52c
...@@ -139,7 +139,7 @@ gem 'html-pipeline', '~> 2.8' ...@@ -139,7 +139,7 @@ gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2.1' gem 'deckar01-task_list', '2.2.1'
gem 'gitlab-markup', '~> 1.7.0' gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
......
...@@ -157,7 +157,7 @@ GEM ...@@ -157,7 +157,7 @@ GEM
coercible (1.0.0) coercible (1.0.0)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
colored2 (3.1.2) colored2 (3.1.2)
commonmarker (0.17.13) commonmarker (0.20.1)
ruby-enum (~> 0.5) ruby-enum (~> 0.5)
concord (0.1.5) concord (0.1.5)
adamantium (~> 0.2.0) adamantium (~> 0.2.0)
...@@ -1146,7 +1146,7 @@ DEPENDENCIES ...@@ -1146,7 +1146,7 @@ DEPENDENCIES
carrierwave (~> 1.3) carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5) charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2) chronic (~> 0.10.2)
commonmarker (~> 0.17) commonmarker (~> 0.20)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
connection_pool (~> 2.0) connection_pool (~> 2.0)
countries (~> 3.0) countries (~> 3.0)
......
...@@ -29,7 +29,9 @@ module Banzai ...@@ -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 # 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`. # and remove `code_block` method from `lib/banzai/renderer/common_mark/html.rb`.
RENDER_OPTIONS = [ 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 ].freeze
RENDER_OPTIONS_SOURCEPOS = RENDER_OPTIONS + [ RENDER_OPTIONS_SOURCEPOS = RENDER_OPTIONS + [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment