diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-08-17 15:00:00 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-08-17 15:00:00 +0300 |
| commit | 04c9b11c531f0d9f1489e2af6e6577d416d051fe (patch) | |
| tree | 89a9e5ca38523162878b460d06c7788cdc919256 | |
| parent | 5850f9102dae9ca8775025a18bd3ced046c51651 (diff) | |
| parent | ab07f5dcb009b446fb50f9f52da35f57b0d1ba04 (diff) | |
Merge branch 'sh-bump-rouge-3-2-1' into 'master'
Bump rouge to 3.2.1
See merge request gitlab-org/gitaly!862
| -rw-r--r-- | changelogs/unreleased/sh-bump-rouge-3-2-1.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-bump-rouge-3-2-1.yml b/changelogs/unreleased/sh-bump-rouge-3-2-1.yml new file mode 100644 index 000000000..f7ccd906a --- /dev/null +++ b/changelogs/unreleased/sh-bump-rouge-3-2-1.yml @@ -0,0 +1,5 @@ +--- +title: Bump rouge to 3.2.1 +merge_request: 862 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 540a4cee6..8b13769c3 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -97,7 +97,7 @@ GEM rake rake (12.1.0) rdoc (4.3.0) - rouge (3.1.1) + rouge (3.2.1) rspec (3.7.0) rspec-core (~> 3.7.0) rspec-expectations (~> 3.7.0) |