From 6cd1f4b87b0a40fa3cd733cb0e33c326959063c8 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 22 May 2018 06:54:55 -0700
Subject: Bump prometheus-client-mmap to 0.9.3 to fix nil exception error

See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24
---
 Gemfile                                                  | 2 +-
 Gemfile.lock                                             | 4 ++--
 changelogs/unreleased/sh-bump-prometheus-client-mmap.yml | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/sh-bump-prometheus-client-mmap.yml

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
-- 
cgit v1.2.1