summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-07-08 12:47:14 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-07-08 12:47:14 +0000
commitd14d1340c6d26a132e8db1f9b883aa87276b457c (patch)
tree54ea8e4c562f0cfd5354d22e6fbf8c5a6cb588cc /Gemfile.lock
parent5b731837810c44f5e0b988186fc66455bd5ac3e4 (diff)
parent18a39e44b0a212d229e3bbc6125b02538fbba01e (diff)
downloadgitlab-ce-d14d1340c6d26a132e8db1f9b883aa87276b457c.tar.gz
Merge branch 'sh-bump-prometheus-client-mmap-0.9.7' into 'master'
Upgrade prometheus-client-mmap to 0.9.7 See merge request gitlab-org/gitlab-ce!30430
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 363baa5f9d5..c1deaa74e1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -652,7 +652,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.6)
+ prometheus-client-mmap (0.9.7)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@@ -1173,7 +1173,7 @@ DEPENDENCIES
peek-redis (~> 1.2.0)
pg (~> 1.1)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.9.6)
+ prometheus-client-mmap (~> 0.9.7)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)