summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-29 12:55:33 -0700
committerStan Hu <stanhu@gmail.com>2019-07-29 12:57:47 -0700
commitdb9ce067730ae21aa0fb46aeaefcac9071d06e8a (patch)
tree09eee65bf5c9191d827920565c51732f27904ce0
parent2a35791a5aed6b088c83a4a0d9e92416368bbd66 (diff)
downloadgitlab-ce-sh-update-rouge-3.7.0.tar.gz
Update rouge to v3.7.0sh-update-rouge-3.7.0
This adds support for a number of new languages (e.g. Ada) and fixes a number of lexers: https://github.com/rouge-ruby/rouge/compare/v3.5.1..v3.7.0 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64625
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--changelogs/unreleased/sh-update-rouge-3-7-0.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index e860ee61cb9..865111ca2bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -134,7 +134,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.5'
+gem 'rouge', '~> 3.7'
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 24dee04833c..4acee765365 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -780,7 +780,7 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.5.1)
+ rouge (3.7.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -1208,7 +1208,7 @@ DEPENDENCIES
redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
- rouge (~> 3.5)
+ rouge (~> 3.7)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 3.8.0)
diff --git a/changelogs/unreleased/sh-update-rouge-3-7-0.yml b/changelogs/unreleased/sh-update-rouge-3-7-0.yml
new file mode 100644
index 00000000000..6828f48863c
--- /dev/null
+++ b/changelogs/unreleased/sh-update-rouge-3-7-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update rouge to v3.7.0
+merge_request: 31254
+author:
+type: other