diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-16 07:07:52 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-16 07:07:52 -0700 |
| commit | c73786ab60df9d38be1c6834311bffd29600247e (patch) | |
| tree | 8602029afb1d4d3e3722bef763e8adaf622a01e4 | |
| parent | 0844ec02f2a6dde9e7fdcf53f4f02cc3547ac960 (diff) | |
| download | gitlab-ce-sh-revert-rouge-bump.tar.gz | |
Revert "Update rouge to v3.10.0"sh-revert-rouge-bump
This reverts commit 3781ac1d6f23b057fe26b8009dbb0f0705fee1d9.
There is a bug in the JSON parser caused by
https://github.com/rouge-ruby/rouge/pull/1297/files. Let's revert until
this is fixed upstream.
Closes https://gitlab.com/gitlab-org/gitlab/issues/32045
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/update-rouge.yml | 5 |
3 files changed, 3 insertions, 8 deletions
@@ -138,7 +138,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.10' +gem 'rouge', '~> 3.7' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.4' diff --git a/Gemfile.lock b/Gemfile.lock index 3952d068678..fd2324d1adc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -804,7 +804,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.10.0) + rouge (3.7.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1237,7 +1237,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.10) + rouge (~> 3.7) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.8.0) diff --git a/changelogs/unreleased/update-rouge.yml b/changelogs/unreleased/update-rouge.yml deleted file mode 100644 index 6f44de02d76..00000000000 --- a/changelogs/unreleased/update-rouge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update rouge to v3.10.0 -merge_request: 32745 -author: -type: other |