From 1096319ef6402963ac8d76410fa542c3ce8788ca Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Mon, 11 Dec 2017 15:28:19 +0000
Subject: Merge branch 'sh-bump-prometheus-gem-properly' into 'master'

Properly bump prometheus-client-mmap gem versions

See merge request gitlab-org/gitlab-ce!15825

(cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6)

938cc162 Properly bump prometheus-client-mmap gem versions
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index 6213167ae0b..60c29ac65c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1107,7 +1107,7 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.7.0.beta39)
+  prometheus-client-mmap (~> 0.7.0.beta43)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)
-- 
cgit v1.2.3