diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-18 05:07:40 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-18 05:07:40 +0000 |
| commit | 91a52bb7d6202722e191ceef75b1c77a79071bf8 (patch) | |
| tree | fecd27d34990606322c5da0793369efbf900d8f7 | |
| parent | 694b55c8281be12d5403dbb8bc6c8951f2716df5 (diff) | |
| parent | 749331ae9133e3b0eb3ef335c702a03d9181f5e4 (diff) | |
| download | gitlab-ce-91a52bb7d6202722e191ceef75b1c77a79071bf8.tar.gz | |
Merge branch 'feature/rouge-2.0.7' into 'master'
bump rouge to 2.0.7
## What does this MR do?
Upgrades Rouge to 2.0.7 for various bugfixes.
## Are there points in the code the reviewer needs to double check?
See the Rouge changelog here: https://github.com/jneen/rouge/blob/v2.0.7/CHANGELOG.md
See merge request !7549
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e6c8adea280..4532f16cfe0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -591,7 +591,7 @@ GEM railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.0.6) + rouge (2.0.7) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) |