summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 00:06:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 00:06:42 +0000
commitb38cf7ccdf8b7ca90bce587a1bf4765631733017 (patch)
tree37b157087207cae5ec7b9e028864e859705c07d6 /Gemfile.lock
parent08f4ce10c04d705148a7e14556443b9e3aee6821 (diff)
downloadgitlab-ce-b38cf7ccdf8b7ca90bce587a1bf4765631733017.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 404c2d550bd..4a2016c8a8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -994,7 +994,7 @@ GEM
temple (0.8.1)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- test-prof (0.2.5)
+ test-prof (0.10.0)
text (1.3.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
@@ -1314,7 +1314,7 @@ DEPENDENCIES
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
- test-prof (~> 0.2.5)
+ test-prof (~> 0.10.0)
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)