diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-02 15:06:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-02 15:06:58 +0000 |
| commit | b6d3dfe5b935872fc8715475e56a528de0589d51 (patch) | |
| tree | 036ab05d816431736c24651da5c3e44daf1d177e | |
| parent | 88e7378c8cab4160fe858d2483362d1575b43125 (diff) | |
| parent | 387c808f9f1778fe490d9add446f8053001582d6 (diff) | |
| download | gitlab-ce-b6d3dfe5b935872fc8715475e56a528de0589d51.tar.gz | |
Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' into 'master'
Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs.
See merge request gitlab-org/gitlab-ce!16175
| -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.beta43' + gem 'prometheus-client-mmap', '~> 0.7.0.beta44' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 90db5bc42fc..3cffed4901b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,7 +634,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta43) + prometheus-client-mmap (0.7.0.beta44) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1122,7 +1122,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta43) + prometheus-client-mmap (~> 0.7.0.beta44) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |