Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'

Update prometheus gem to fix build on RPi Closes omnibus-gitlab#2988 See merge request gitlab-org/gitlab-ce!15616

Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'
8e7e2aeb · Robert Speicher · 04ceeac1 · 359f41fa · 8e7e2aeb · 8e7e2aeb
Commit 8e7e2aeb authored Nov 27, 2017 by Robert Speicher
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
@@ -283,7 +283,7 @@ group :metrics do
  gem 'influxdb', '~> 0.2', require: false

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


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -625,7 +625,7 @@ GEM
      parser
      unparser
    procto (0.0.3)
-    prometheus-client-mmap (0.7.0.beta37)
+    prometheus-client-mmap (0.7.0.beta39)
      mmap2 (~> 2.2, >= 2.2.9)
    pry (0.10.4)
      coderay (~> 1.1.0)
@@ -1111,7 +1111,7 @@ DEPENDENCIES
  peek-sidekiq (~> 1.0.3)
  pg (~> 0.18.2)
  premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.7.0.beta37)
+  prometheus-client-mmap (~> 0.7.0.beta39)
  pry-byebug (~> 3.4.1)
  pry-rails (~> 0.3.4)
  rack-attack (~> 4.4.1)