summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 09:09:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 09:09:48 +0000
commit3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b (patch)
treeeccfc6b87b404f2871cc795bf2f7223a7e391939 /Gemfile.lock
parent65a1175e466105fca1f40cb5a995fdb100ff334e (diff)
downloadgitlab-ce-3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 169b30c2c6e..89cee333738 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -889,7 +889,7 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.16.0)
+ rouge (3.17.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -1346,7 +1346,7 @@ DEPENDENCIES
request_store (~> 1.3)
responders (~> 3.0)
retriable (~> 3.1.2)
- rouge (~> 3.16.0)
+ rouge (~> 3.17.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 4.0.0.beta4)