diff options
author | Stan Hu <stanhu@gmail.com> | 2019-07-05 22:20:19 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-07-06 01:14:53 -0700 |
commit | cd4b88a22cfdf1929077c08fc857920faf85e04c (patch) | |
tree | e4806835d5bac7dce42be8246db58bdb0aaf7d7e | |
parent | 6e9f882007a18d594b4a53e417a87fdeec3bc29f (diff) | |
download | gitlab-ce-cd4b88a22cfdf1929077c08fc857920faf85e04c.tar.gz |
Upgrade Rouge to 3.5.1sh-upgrade-rouge-3.5.1
This release includes continued improvements to the library, fixes for a
number of lexers and support for three new languages:
https://github.com/rouge-ruby/rouge/releases
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | changelogs/unreleased/sh-upgrade-rouge-3-5-1.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -132,7 +132,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.9' -gem 'rouge', '~> 3.1' +gem 'rouge', '~> 3.5' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.3' diff --git a/Gemfile.lock b/Gemfile.lock index 5099167e03f..363baa5f9d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -770,7 +770,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.4.1) + rouge (3.5.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1199,7 +1199,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.1) + rouge (~> 3.5) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.7.0) diff --git a/changelogs/unreleased/sh-upgrade-rouge-3-5-1.yml b/changelogs/unreleased/sh-upgrade-rouge-3-5-1.yml new file mode 100644 index 00000000000..b408019c736 --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-rouge-3-5-1.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Rouge to 3.5.1 +merge_request: 30431 +author: +type: changed |