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 a2d16480) 938cc162 Properly bump prometheus-client-mmap gem versions

Merge branch 'sh-bump-prometheus-gem-properly' into 'master'
1096319e · Robert Speicher · LUKE BENNETT · ced708d3 · 1096319e · 1096319e
Commit 1096319e authored Dec 11, 2017 by Robert Speicher Committed by LUKE BENNETT Dec 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -283,7 +283,7 @@ group :metrics do
  gem 'influxdb', '~> 0.2', require: false

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


--- 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)