Automatic merge of gitlab-org/gitlab-ce master

33147147 · GitLab Bot · 75c88986 · d14d1340 · 33147147 · 33147147
Commit 33147147 authored Jul 08, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,7 @@ group :metrics do
  gem 'influxdb', '~> 0.2', require: false
  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.6'
+  gem 'prometheus-client-mmap', '~> 0.9.7'
  gem 'raindrops', '~> 0.18'
 end

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -683,7 +683,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)
@@ -1215,7 +1215,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)