diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-29 12:55:33 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-29 15:37:23 -0700 |
| commit | 7d745d31d96f84d3da863843976121aafe3256b5 (patch) | |
| tree | 4b41812017a06b836904a1ae96cd0384cd4cc4a2 | |
| parent | 7395831dc4d2ee9f5d90ed2f528015eae11c7b17 (diff) | |
| download | gitlab-ce-7d745d31d96f84d3da863843976121aafe3256b5.tar.gz | |
Update rouge to v3.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-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-update-rouge-3-7-0.yml | 5 | ||||
| -rw-r--r-- | spec/features/markdown/copy_as_gfm_spec.rb | 2 |
4 files changed, 9 insertions, 4 deletions
@@ -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 3614f111a4b..a87bf239fb9 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 diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb index 176801d482e..c098a1b3e3a 100644 --- a/spec/features/markdown/copy_as_gfm_spec.rb +++ b/spec/features/markdown/copy_as_gfm_spec.rb @@ -798,7 +798,7 @@ describe 'Copy as GFM', :js do context 'selecting one word of text' do it 'copies as inline code' do verify( - '.line[id="LC27"] .s2', + '.line[id="LC27"] .nl', '`"bio"`' ) |