summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-10-02 01:40:53 +0000
committerStan Hu <stanhu@gmail.com>2018-10-02 01:40:53 +0000
commit2bb8c1caa583e1efbc207c4093ea2159bfcc1db1 (patch)
treef3d13a7853288ce307e7759a069f8599d9567061 /Gemfile.lock
parent0ef1060e14b8ac09159e466fe5f4ca3195e080c2 (diff)
parent21a5e70bf49363881c1215fe695255db61df7cba (diff)
downloadgitlab-ce-2bb8c1caa583e1efbc207c4093ea2159bfcc1db1.tar.gz
Merge branch 'rouge-3.3.0' into 'master'
Update to Rouge 3.3.0 including frozen string literals for improved memory usage See merge request gitlab-org/gitlab-ce!22035
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 910e07f4a66..69a1c899cc5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -729,7 +729,7 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.2.1)
+ rouge (3.3.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)