Commit 9c7caf34 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'sh-update-rouge-3.7.0' into 'master'

Update rouge to v3.7.0

Closes #64625

See merge request gitlab-org/gitlab-ce!31254
parents d2b5283a 7d745d31
...@@ -134,7 +134,7 @@ gem 'wikicloth', '0.8.1' ...@@ -134,7 +134,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.5' gem 'rouge', '~> 3.7'
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.3' gem 'nokogiri', '~> 1.10.3'
......
...@@ -780,7 +780,7 @@ GEM ...@@ -780,7 +780,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.5.1) rouge (3.7.0)
rqrcode (0.7.0) rqrcode (0.7.0)
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
...@@ -1208,7 +1208,7 @@ DEPENDENCIES ...@@ -1208,7 +1208,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.5) rouge (~> 3.7)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 3.8.0) rspec-rails (~> 3.8.0)
......
---
title: Update rouge to v3.7.0
merge_request: 31254
author:
type: other
...@@ -798,7 +798,7 @@ describe 'Copy as GFM', :js do ...@@ -798,7 +798,7 @@ describe 'Copy as GFM', :js do
context 'selecting one word of text' do context 'selecting one word of text' do
it 'copies as inline code' do it 'copies as inline code' do
verify( verify(
'.line[id="LC27"] .s2', '.line[id="LC27"] .nl',
'`"bio"`' '`"bio"`'
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment