summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-05-22 15:21:18 +0000
committerNick Thomas <nick@gitlab.com>2018-05-22 15:21:18 +0000
commitb884cfc6c212e8d9fbe709e8859de4526d436836 (patch)
tree9835cfbcc2c71bf01f95843c79f7cf12dd213dca
parentff5f3560928124de3c081feb8914d77f635c05c2 (diff)
parent6cd1f4b87b0a40fa3cd733cb0e33c326959063c8 (diff)
downloadgitlab-ce-b884cfc6c212e8d9fbe709e8859de4526d436836.tar.gz
Merge branch 'sh-bump-prometheus-client-mmap' into 'master'
Bump prometheus-client-mmap to 0.9.3 to fix nil exception error See merge request gitlab-org/gitlab-ce!19085
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--changelogs/unreleased/sh-bump-prometheus-client-mmap.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index ba1b3e93b7b..6730ee9c164 100644
--- a/Gemfile
+++ b/Gemfile
@@ -297,7 +297,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~> 0.9.2'
+ gem 'prometheus-client-mmap', '~> 0.9.3'
gem 'raindrops', '~> 0.18'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a33c08512a..9c2ef9dfa91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -629,7 +629,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.2)
+ prometheus-client-mmap (0.9.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -1115,7 +1115,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.9.2)
+ prometheus-client-mmap (~> 0.9.3)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
diff --git a/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml b/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml
new file mode 100644
index 00000000000..ea8bb0b365b
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml
@@ -0,0 +1,5 @@
+---
+title: Bump prometheus-client-mmap to 0.9.3 to fix nil exception error
+merge_request:
+author:
+type: fixed