summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-19 08:52:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-19 08:52:01 +0000
commit1c7893c5c1bf3ee78351765c0db41c9247ec8e88 (patch)
tree2ac6bd92320798f0d93a208d5f9e8e6be7e986c1 /Gemfile.lock
parent1314b79d93b601f60c3032e1223cdb09e5af3a3a (diff)
parent66c7f518974cf3e3c9d9914fe7dd5b89f216889b (diff)
downloadgitlab-ce-1c7893c5c1bf3ee78351765c0db41c9247ec8e88.tar.gz
Merge branch 'rc/bump-peek-performance_bar' into 'master'
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
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 f9783a3468c..63eb0712ef3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -557,7 +557,7 @@ GEM
atomic (>= 1.0.0)
mysql2
peek
- peek-performance_bar (1.2.1)
+ peek-performance_bar (1.3.0)
peek (>= 0.1.0)
peek-pg (1.3.0)
concurrent-ruby
@@ -1034,7 +1034,7 @@ DEPENDENCIES
peek-gc (~> 0.0.2)
peek-host (~> 1.0.0)
peek-mysql2 (~> 1.1.0)
- peek-performance_bar (~> 1.2.1)
+ peek-performance_bar (~> 1.3.0)
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)