diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-16 23:57:38 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-16 23:57:38 +0300 |
| commit | 6fc10af5a9ab5ab81e4e9e3666ced7b4ea87c176 (patch) | |
| tree | 3191c3cf6bf05c77c7366c1e012cea9053cad757 | |
| parent | f18bb9d5f2a5c52ed0b6311302ee05c641458a01 (diff) | |
| parent | 84af372fc3d75e151d62102ff3acb42beb62b6a1 (diff) | |
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 b33dd75c278..1aadc3fd0b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -743,7 +743,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 |