summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-24 12:11:12 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-24 12:11:12 +0000
commit7eaef13093fcd2d6794b056519c461499f690ea8 (patch)
treee0d0fc6b114eb29330031ca3836b97ac7db061dc /Gemfile.lock
parent3d3951a2ae1a5c23d373689ee4c96ed973320ae6 (diff)
parent87308484fa60bfdbd5a03674cd0c619a225aa95c (diff)
downloadgitlab-ce-7eaef13093fcd2d6794b056519c461499f690ea8.tar.gz
Merge branch 'pawel/bump_prometheus_client_library' into 'master'
Fix bug causing truncation of Metrics files See merge request !13035
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 f8aaba57998..6ffff0d8735 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -591,7 +591,7 @@ GEM
premailer-rails (1.9.7)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
- prometheus-client-mmap (0.7.0.beta9)
+ prometheus-client-mmap (0.7.0.beta10)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)