Commit 99870258 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'sh-upgrade-rouge-3.5.1' into 'master'

Upgrade Rouge to 3.5.1

See merge request gitlab-org/gitlab-ce!30431
parents 688f47ee cd4b88a2
...@@ -132,7 +132,7 @@ gem 'wikicloth', '0.8.1' ...@@ -132,7 +132,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.9' gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.5'
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.3' gem 'nokogiri', '~> 1.10.3'
......
...@@ -770,7 +770,7 @@ GEM ...@@ -770,7 +770,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.4.1) rouge (3.5.1)
rqrcode (0.7.0) rqrcode (0.7.0)
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
...@@ -1199,7 +1199,7 @@ DEPENDENCIES ...@@ -1199,7 +1199,7 @@ DEPENDENCIES
redis-rails (~> 5.0.2) redis-rails (~> 5.0.2)
request_store (~> 1.3) request_store (~> 1.3)
responders (~> 2.0) responders (~> 2.0)
rouge (~> 3.1) rouge (~> 3.5)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 3.7.0) rspec-rails (~> 3.7.0)
......
---
title: Upgrade Rouge to 3.5.1
merge_request: 30431
author:
type: changed
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