summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-08-26 04:43:37 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-08-26 04:43:37 +0000
commitf7dc2825c1f5d3a731a427e6f23ba0445556c6ce (patch)
treef709fb9cb4f962a584dcca464451f45f3979028b /Gemfile.lock
parent21996b027de0c2ba09042330cc1b1160d1d0a0de (diff)
parent87e87b7b8c2f7e6731e92cdafd2671e983d97a92 (diff)
downloadgitlab-ce-f7dc2825c1f5d3a731a427e6f23ba0445556c6ce.tar.gz
Merge branch 'sh-upgrade-ruby-prof' into 'master'
Bump ruby-prof to 1.0.0 See merge request gitlab-org/gitlab-ce!29588
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 43b9eec4967..a6a44cc6960 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -837,7 +837,7 @@ GEM
i18n
ruby-fogbugz (0.2.1)
crack (~> 0.4)
- ruby-prof (0.17.0)
+ ruby-prof (1.0.0)
ruby-progressbar (1.10.1)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
@@ -1218,7 +1218,7 @@ DEPENDENCIES
rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
- ruby-prof (~> 0.17.0)
+ ruby-prof (~> 1.0.0)
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)