diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-04 18:29:12 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-04 18:29:12 +0000 |
| commit | 716baf691fd212190aff5f944bb42ec84f799743 (patch) | |
| tree | 1bef0e8ddeb79e9746328ff2552b752305286857 | |
| parent | aaf680750110797265f2615498987f6ace18c743 (diff) | |
| parent | 7ac065d0f5fef25a1b8a1b2be76567ddad0e29fd (diff) | |
| download | gitlab-ce-716baf691fd212190aff5f944bb42ec84f799743.tar.gz | |
Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' into 'master'
Update prometheus client gem
See merge request !12632
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e6ea006356c..430e1ba257b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -599,8 +599,8 @@ GEM premailer-rails (1.9.7) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - prometheus-client-mmap (0.7.0.beta7) - mmap2 (~> 2.2.6) + prometheus-client-mmap (0.7.0.beta8) + mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) |