Commit 9b3f215d authored by Thong Kuah's avatar Thong Kuah

Merge branch 'update-rouge-version' into 'master'

Update rouge to 3.17

See merge request gitlab-org/gitlab!26957
parents 8ea25523 53a353ef
...@@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1' ...@@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.10' gem 'asciidoctor-plantuml', '0.0.10'
gem 'rouge', '~> 3.16.0' gem 'rouge', '~> 3.17.0'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.5' gem 'nokogiri', '~> 1.10.5'
......
...@@ -889,7 +889,7 @@ GEM ...@@ -889,7 +889,7 @@ GEM
retriable (3.1.2) retriable (3.1.2)
rinku (2.0.0) rinku (2.0.0)
rotp (2.1.2) rotp (2.1.2)
rouge (3.16.0) rouge (3.17.0)
rqrcode (0.7.0) rqrcode (0.7.0)
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
...@@ -1346,7 +1346,7 @@ DEPENDENCIES ...@@ -1346,7 +1346,7 @@ DEPENDENCIES
request_store (~> 1.3) request_store (~> 1.3)
responders (~> 3.0) responders (~> 3.0)
retriable (~> 3.1.2) retriable (~> 3.1.2)
rouge (~> 3.16.0) rouge (~> 3.17.0)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 4.0.0.beta4) rspec-rails (~> 4.0.0.beta4)
......
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