Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' into 'master'

Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs. See merge request gitlab-org/gitlab-ce!16175 (cherry picked from commit b6d3dfe5) 387c808f Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs.

Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' into 'master'
317b90d2 · Douwe Maan · Tiago · bf839801 · 317b90d2 · 317b90d2
Commit 317b90d2 authored Jan 02, 2018 by Douwe Maan Committed by Tiago Jan 19, 2018
Hide 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
@@ -287,7 +287,7 @@ group :metrics do
  gem 'influxdb', '~> 0.2', require: false

  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
+  gem 'prometheus-client-mmap', '~> 0.7.0.beta44'
  gem 'raindrops', '~> 0.18'
 end


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -622,7 +622,7 @@ GEM
      parser
      unparser
    procto (0.0.3)
-    prometheus-client-mmap (0.7.0.beta43)
+    prometheus-client-mmap (0.7.0.beta44)
    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
@@ -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.beta43)
+  prometheus-client-mmap (~> 0.7.0.beta44)
  pry-byebug (~> 3.4.1)
  pry-rails (~> 0.3.4)
  rack-attack (~> 4.4.1)