Merge branch 'update-rouge' into 'master'
Update rouge to v3.10.0 See merge request gitlab-org/gitlab-ce!32745
This commit is contained in:
commit
1ffa66effb
2
Gemfile
2
Gemfile
|
@ -135,7 +135,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.7'
|
gem 'rouge', '~> 3.10'
|
||||||
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.4'
|
gem 'nokogiri', '~> 1.10.4'
|
||||||
|
|
|
@ -799,7 +799,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.7.0)
|
rouge (3.10.0)
|
||||||
rqrcode (0.7.0)
|
rqrcode (0.7.0)
|
||||||
chunky_png
|
chunky_png
|
||||||
rqrcode-rails3 (0.1.7)
|
rqrcode-rails3 (0.1.7)
|
||||||
|
@ -1229,7 +1229,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.7)
|
rouge (~> 3.10)
|
||||||
rqrcode-rails3 (~> 0.1.7)
|
rqrcode-rails3 (~> 0.1.7)
|
||||||
rspec-parameterized
|
rspec-parameterized
|
||||||
rspec-rails (~> 3.8.0)
|
rspec-rails (~> 3.8.0)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update rouge to v3.10.0
|
||||||
|
merge_request: 32745
|
||||||
|
author:
|
||||||
|
type: other
|
Loading…
Reference in New Issue