diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-30 15:17:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-30 15:17:30 +0000 |
| commit | 2507d0abc959fbf28cc15153c4a38933e5b777bc (patch) | |
| tree | f1712a61d43010ffcee7d77962bb5ddfa6c16285 | |
| parent | c90d7633da7837deedd67f344ac8d00ba54c4989 (diff) | |
| parent | bfffbc7fd12060adecba8d8226798f4fd3bf8c23 (diff) | |
| download | gitlab-ce-2507d0abc959fbf28cc15153c4a38933e5b777bc.tar.gz | |
Merge branch 'sh-bump-prometheus-client-mmap-gem' into 'master'
Bump prometheus-client-mmap to 0.9.4
See merge request gitlab-org/gitlab-ce!20891
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -306,7 +306,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.3' + gem 'prometheus-client-mmap', '~> 0.9.4' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index d147f81c81e..77c255a7464 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -635,7 +635,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.3) + prometheus-client-mmap (0.9.4) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1126,7 +1126,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.3) + prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index b055b561b61..f7886245504 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -639,7 +639,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.3) + prometheus-client-mmap (0.9.4) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1136,7 +1136,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.3) + prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |