diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-28 13:38:57 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-28 13:38:57 +0000 |
| commit | e673001442b0ee7d56b36e09739f4efa8b06152e (patch) | |
| tree | afc1af02cec13a0b501f8402dd8c946d08621b39 | |
| parent | 7b27e067cad968e34a5a896feb0bef4c978e66a0 (diff) | |
| parent | dc466bd99a22754a863af0a936e712156cc12560 (diff) | |
| download | gitlab-ce-e673001442b0ee7d56b36e09739f4efa8b06152e.tar.gz | |
Merge branch 'update-prometheus-client-mmap' into 'master'
Update prometheus-client-mmap to 0.9.6
Closes #63872
See merge request gitlab-org/gitlab-ce!30165
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -309,7 +309,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.6' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 4881faac0e0..fd366ac16b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -652,7 +652,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.4) + prometheus-client-mmap (0.9.6) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -1173,7 +1173,7 @@ DEPENDENCIES peek-redis (~> 1.2.0) pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.4) + prometheus-client-mmap (~> 0.9.6) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) |