diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-04 18:29:12 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 21:39:57 +0100 |
| commit | 116eb1cd4e5f88c3c2d90c16c95534e9cef10586 (patch) | |
| tree | 75fc324765bbb65e6646158de288f027d6679144 | |
| parent | 9883dae4e1b10b48ccafa1aa8a8bd2e2e1a1cdb3 (diff) | |
| download | gitlab-ce-116eb1cd4e5f88c3c2d90c16c95534e9cef10586.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 0de8746109e..2f9d3bfc8ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -595,8 +595,8 @@ GEM premailer-rails (1.9.7) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - prometheus-client-mmap (0.7.0.beta5) - 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) |