summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-27 15:47:01 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-27 15:47:01 +0000
commit98619a49c8e239a9e7c39451d72de4855a3eef9e (patch)
tree2d02158f7134daab3b1461b79f692a3b77a6c26d /Gemfile.lock
parentd5f91df9a5e5adf58f1729cda728babcd10f7099 (diff)
parent3265ac4f39e6760340722c524113ac1691fdcf8d (diff)
downloadgitlab-ce-98619a49c8e239a9e7c39451d72de4855a3eef9e.tar.gz
Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'
Fix prometheus client pid reuse bug See merge request !13130
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 2483b0bf35c..d124cd00ee0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -597,7 +597,7 @@ GEM
premailer-rails (1.9.7)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
- prometheus-client-mmap (0.7.0.beta10)
+ prometheus-client-mmap (0.7.0.beta11)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)
@@ -1050,7 +1050,7 @@ DEPENDENCIES
pg (~> 0.18.2)
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta9)
+ prometheus-client-mmap (~> 0.7.0.beta11)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)