diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-09-18 07:43:54 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-09-18 07:43:54 +0300 |
| commit | 6f7fb057e8e755ae9066cffcb88cb9137266a60f (patch) | |
| tree | bb9a9271ae2379a9f6cd4376ce763b27c7ae8ecc | |
| parent | d96f0f2303c2d0b03ed4a9a31dd69323fa78f6a3 (diff) | |
| parent | 45906c4c656a488013c4b3ce7d39ac79d222e97f (diff) | |
Merge branch 'sh-upgrade-rouge-3.11.0' into 'master'
Upgrade Rouge to v3.11.0
See merge request gitlab-org/gitaly!1493
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml b/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml new file mode 100644 index 000000000..b3214eaf1 --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Rouge to v3.11.0 +merge_request: 1493 +author: +type: fixed diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 25fbacc84..cb292af8c 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -147,7 +147,7 @@ GEM optimist (>= 3.0.0) rdoc (4.3.0) redis (4.1.2) - rouge (3.10.0) + rouge (3.11.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) |