diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-16 20:57:38 +0000 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-17 13:02:19 -0500 |
| commit | d2eff1fac21ace733460a4c32373ee56f95c3235 (patch) | |
| tree | ff7048e08a770e3620b68cf8d925da5276325503 | |
| parent | 9e5f6c7476e3bbc789ab228db945b31075a6e4fb (diff) | |
| download | gitlab-ce-d2eff1fac21ace733460a4c32373ee56f95c3235.tar.gz | |
Merge branch 'rouge_3.2.1' into 'master'
Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer
See merge request gitlab-org/gitlab-ce!21263
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rouge_3-2-1.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1537cacaadd..6328110197c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -745,7 +745,7 @@ GEM retriable (3.1.1) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.0) + rouge (3.2.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) diff --git a/changelogs/unreleased/rouge_3-2-1.yml b/changelogs/unreleased/rouge_3-2-1.yml new file mode 100644 index 00000000000..b281a4f0e95 --- /dev/null +++ b/changelogs/unreleased/rouge_3-2-1.yml @@ -0,0 +1,5 @@ +--- +title: Update to Rouge 3.2.1, which includes a critical fix to the Perl Lexer +merge_request: 21263 +author: +type: changed |