diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-06 18:09:55 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-06 18:09:55 +0000 |
| commit | 1ffa66effbc9272ac9755ba29fab2fd1b3d93db5 (patch) | |
| tree | 2c10ad90767c11e2b789d8daa29d7da099beb8a5 | |
| parent | 86f6d60a615aefd56d7e92bb42b54176b2a74472 (diff) | |
| parent | 3781ac1d6f23b057fe26b8009dbb0f0705fee1d9 (diff) | |
| download | gitlab-ce-1ffa66effbc9272ac9755ba29fab2fd1b3d93db5.tar.gz | |
Merge branch 'update-rouge' into 'master'
Update rouge to v3.10.0
See merge request gitlab-org/gitlab-ce!32745
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/update-rouge.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -135,7 +135,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.7' +gem 'rouge', '~> 3.10' 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 d787b5c0569..515e1795671 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -799,7 +799,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.7.0) + rouge (3.10.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1229,7 +1229,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.7) + rouge (~> 3.10) 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 new file mode 100644 index 00000000000..6f44de02d76 --- /dev/null +++ b/changelogs/unreleased/update-rouge.yml @@ -0,0 +1,5 @@ +--- +title: Update rouge to v3.10.0 +merge_request: 32745 +author: +type: other |