diff options
| author | John Cai <jcai@gitlab.com> | 2019-07-08 21:29:23 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-07-08 21:29:23 +0300 |
| commit | 169e4fadd697d3b93d244807bb0d7e12ff0c861d (patch) | |
| tree | 2a5bcb0f742aee070ac7defad499ab9494fd6e18 | |
| parent | 006af5ab9eba56bb37373c569584db349586b3bb (diff) | |
| parent | 7c1a3f872ecb802b127e822889f25951af8665dd (diff) | |
Merge branch 'sh-upgrade-rouge' into 'master'
Upgrade Rouge to 3.5.1
See merge request gitlab-org/gitaly!1355
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-rouge.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-upgrade-rouge.yml b/changelogs/unreleased/sh-upgrade-rouge.yml new file mode 100644 index 000000000..6cb3ecdd1 --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-rouge.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade rouge to 3.5.1 +merge_request: 1355 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 604b48429..0a86273f7 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -147,7 +147,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (4.3.0) - rouge (3.3.0) + rouge (3.5.1) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) |