summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 03:08:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 03:08:37 +0000
commit2399724614f3c4dcf3059038d997193830de93ee (patch)
tree3315c4453ef3efb5c1162911753436cad4f3e57d /Gemfile.lock
parent6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (diff)
downloadgitlab-ce-2399724614f3c4dcf3059038d997193830de93ee.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 377213bc882..4949ac8b9a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1328,7 +1328,7 @@ DEPENDENCIES
request_store (~> 1.3)
responders (~> 3.0)
retriable (~> 3.1.2)
- rouge (~> 3.11.0)
+ rouge (~> 3.15.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 4.0.0.beta3)