diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-30 13:02:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-30 13:02:20 +0000 |
| commit | 9a58468bee9a28d5762fb9f75e4d457552f943c8 (patch) | |
| tree | 4ba6666bdb1b6fd6611403073eb9b966259cb509 | |
| parent | 76bbf40dc8b47c4e1544ad94cc16dee6472ae7e4 (diff) | |
| parent | ab64a7f21bd6944d9c4e5400ecdc4a6c854788fe (diff) | |
| download | gitlab-ce-9a58468bee9a28d5762fb9f75e4d457552f943c8.tar.gz | |
Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master'
Update Prometheus Gem to fix problem caused by using wrong data offsets
See merge request gitlab-org/gitlab-ce!15081
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta17' + gem 'prometheus-client-mmap', '~>0.7.0.beta18' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 53efb1c76c2..34f4e6af7e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,7 +623,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta17) + prometheus-client-mmap (0.7.0.beta18) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1106,7 +1106,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta17) + prometheus-client-mmap (~> 0.7.0.beta18) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |