diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-06 12:20:50 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-06 12:20:50 +0000 |
| commit | 998702582901ef6145b35e17c84a5a073adef878 (patch) | |
| tree | 05d9e666686a460340816264157c52b345ecfe7c | |
| parent | 688f47eeb885b76f7d1ec5291d7686978dc95c40 (diff) | |
| parent | cd4b88a22cfdf1929077c08fc857920faf85e04c (diff) | |
| download | gitlab-ce-998702582901ef6145b35e17c84a5a073adef878.tar.gz | |
Merge branch 'sh-upgrade-rouge-3.5.1' into 'master'
Upgrade Rouge to 3.5.1
See merge request gitlab-org/gitlab-ce!30431
| -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 |