BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3c71af9f by Stan Hu
Options

Merge branch 'pawel/update_prometheus_gem_to_fix_compilation_on_centos' into 'master'

Update prometheus Gem to fix compilation on centos 6 due to GCC not recognizing `std=c11` option Closes omnibus-gitlab#2988 See merge request gitlab-org/gitlab-ce!15598
parents b355ebc4 d261e274
Showing with 3 additions and 3 deletions
Gemfile
...@@ -283,7 +283,7 @@ group :metrics do ...@@ -283,7 +283,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.7.0.beta36' gem 'prometheus-client-mmap', '~> 0.7.0.beta37'
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
......
Gemfile.lock
...@@ -625,7 +625,7 @@ GEM ...@@ -625,7 +625,7 @@ GEM
parser parser
unparser unparser
procto (0.0.3) procto (0.0.3)
prometheus-client-mmap (0.7.0.beta36) prometheus-client-mmap (0.7.0.beta37)
mmap2 (~> 2.2, >= 2.2.9) mmap2 (~> 2.2, >= 2.2.9)
pry (0.10.4) pry (0.10.4)
coderay (~> 1.1.0) coderay (~> 1.1.0)
...@@ -1111,7 +1111,7 @@ DEPENDENCIES ...@@ -1111,7 +1111,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3) peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2) pg (~> 0.18.2)
premailer-rails (~> 1.9.7) premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.7.0.beta36) prometheus-client-mmap (~> 0.7.0.beta37)
pry-byebug (~> 3.4.1) pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1) rack-attack (~> 4.4.1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment