diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-07 03:59:45 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-07 03:59:45 +0000 |
| commit | 48cf8e49efc70bec7ff473d32e8aa6279a007f22 (patch) | |
| tree | 2c37a53c8d72ca84eb2a35c9bbe871f25b0415a4 /Gemfile.lock | |
| parent | 1386013abd5f890e54db61945e858525890b7d0c (diff) | |
| parent | 8f28dc950ac21feba4c187bf96fed5615943ad76 (diff) | |
| download | gitlab-ce-48cf8e49efc70bec7ff473d32e8aa6279a007f22.tar.gz | |
Merge branch 'bump-rouge' into 'master'
Bump rouge to 1.11.0
See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md
See merge request !4491
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5f1dbd431e4..21d8f345cd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -569,7 +569,7 @@ GEM railties (>= 4.2.0, < 5.1) rinku (1.7.3) rotp (2.1.2) - rouge (1.10.1) + rouge (1.11.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -926,7 +926,7 @@ DEPENDENCIES request_store (~> 1.3.0) rerun (~> 0.11.0) responders (~> 2.0) - rouge (~> 1.10.1) + rouge (~> 1.11) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.4.0) rspec-retry |