summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 03:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 03:08:47 +0000
commitd36aa82340b8bdd23296de41b9c2a49765d92fcd (patch)
tree5548b7030a89b6d327292a40b448c6b2a40a750a /Gemfile.lock
parent60f63d15794e62c4bac9756445f618cd9acb8654 (diff)
downloadgitlab-ce-d36aa82340b8bdd23296de41b9c2a49765d92fcd.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 aa33bd4cd68..fd8ada1235b 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.15.0)
+ rouge (3.16.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -1347,7 +1347,7 @@ DEPENDENCIES
request_store (~> 1.3)
responders (~> 3.0)
retriable (~> 3.1.2)
- rouge (~> 3.15.0)
+ rouge (~> 3.16.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 4.0.0.beta3)