Commit cd57920a authored by Chad Woolley's avatar Chad Woolley Committed by Dominic Couture

Update gitlab-markup gem to 1.8.0

Changes to gem:

* Disable configuration file processing in RST
* Wrap call to rest2html in a timeout

See https://gitlab.com/gitlab-org/gitlab-markup/-/commit/9e023643c24a72089930b838aaad7bf71e70affc#d30b04166486087de34ff05cf278d3dd2ddd2360

Changelog: fixed
parent fc277453
......@@ -153,7 +153,7 @@ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.13.2'
gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.1'
gem 'gitlab-markup', '~> 1.8.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.2'
gem 'kramdown', '~> 2.3.1'
......
......@@ -489,7 +489,7 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1)
gitlab-markup (1.8.0)
gitlab-net-dns (0.9.1)
gitlab-omniauth-openid-connect (0.8.0)
addressable (~> 2.7)
......@@ -1482,7 +1482,7 @@ DEPENDENCIES
gitlab-license (~> 2.0)
gitlab-license_finder (~> 6.0)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
gitlab-markup (~> 1.8.0)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.8.0)
gitlab-sidekiq-fetcher (= 0.8.0)
......
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