summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-11-27 20:39:18 +0000
committerRobert Speicher <robert@gitlab.com>2017-11-27 20:39:18 +0000
commit8e7e2aeb4f0f9e1e61366a62e41fd15936593cfd (patch)
treec7c154d99d206581b61dfd214d73c5986c338355
parent04ceeac1f6c56f1c1f3faa9da6e8bc563b6c1393 (diff)
parent359f41fad1d3490191c9efa3a208cf07ea924835 (diff)
downloadgitlab-ce-8e7e2aeb4f0f9e1e61366a62e41fd15936593cfd.tar.gz
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
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index dd33ca07128..a422cee38e3 100644
--- 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
diff --git a/Gemfile.lock b/Gemfile.lock
index c46bed111b9..cfad693f933 100644
--- 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)