Commit 15c89699 authored by Imre Farkas's avatar Imre Farkas

Merge branch '276911-fix-ruby-lexer-rouge-bug' into 'master'

Fix syntax highlight issue with regular expressions

See merge request gitlab-org/gitlab!47469
parents 29746b66 f4f96849
......@@ -159,7 +159,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.12'
gem 'rouge', '~> 3.24.0'
gem 'rouge', '~> 3.25.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.9'
......
......@@ -977,7 +977,7 @@ GEM
rexml (3.2.4)
rinku (2.0.0)
rotp (2.1.2)
rouge (3.24.0)
rouge (3.25.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
......@@ -1468,7 +1468,7 @@ DEPENDENCIES
request_store (~> 1.5)
responders (~> 3.0)
retriable (~> 3.1.2)
rouge (~> 3.24.0)
rouge (~> 3.25.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 4.0.0)
......
---
title: Fix syntax highlight issue with regular expressions
merge_request: 47469
author:
type: fixed
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