summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-08 18:43:53 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-08 18:43:53 +0000
commitb77d94aab5e021e35e60e5c03fdd9993577f8b48 (patch)
tree5aa4580352d5e07382799bbf4fc3a783acd812c2
parent8f9fbbebc5c5b679730a14a8aef165954c1099c0 (diff)
parent8ae165e6e7e63135077ebfccaf2762cde14e1fa6 (diff)
downloadgitlab-ce-b77d94aab5e021e35e60e5c03fdd9993577f8b48.tar.gz
Merge branch 'sh-bump-prom-mmap-gem' into 'master'
Bump prometheus-client-mmap to 0.9.8 See merge request gitlab-org/gitlab-ce!30479
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f65549f2734..f567eac3ee0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -309,7 +309,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~> 0.9.7'
+ gem 'prometheus-client-mmap', '~> 0.9.8'
gem 'raindrops', '~> 0.18'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index c1deaa74e1f..668cfff4fb4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -652,7 +652,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.7)
+ prometheus-client-mmap (0.9.8)
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.7)
+ prometheus-client-mmap (~> 0.9.8)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)