diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-24 18:33:46 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-11-24 18:33:46 +0000 |
| commit | 3c71af9fdf0858470f6430db95ab4c2c5625791b (patch) | |
| tree | adc63991346aa42dc9fce157c052531f61b07480 | |
| parent | b355ebc4c9b38320366d7640ecf51da23fbb7ea1 (diff) | |
| parent | d261e274bfa8b4612f5591a5124cc4bc5403bac3 (diff) | |
| download | gitlab-ce-3c71af9fdf0858470f6430db95ab4c2c5625791b.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -283,7 +283,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.7.0.beta36' + gem 'prometheus-client-mmap', '~> 0.7.0.beta37' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 69d20bdbbb3..3fcb223dd4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,7 +625,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta36) + prometheus-client-mmap (0.7.0.beta37) 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.beta36) + prometheus-client-mmap (~> 0.7.0.beta37) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |