diff options
author | Stan Hu <stanhu@gmail.com> | 2017-12-07 17:45:08 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-12-07 17:45:08 +0000 |
commit | aa24f7e1abac167189a76590dbaccd5b53726507 (patch) | |
tree | 86bc7205981bcc4e52072a7db49d91bdc34ac2ea /Gemfile.lock | |
parent | 989d3148e1a274fb6baf1d90f28dcfaa331a57b0 (diff) | |
parent | ee22a47d629fb13a52100921761f833acd80dbd9 (diff) | |
download | gitlab-ce-aa24f7e1abac167189a76590dbaccd5b53726507.tar.gz |
Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
Update prometheus-client-mmap gem to highly optimized version
See merge request gitlab-org/gitlab-ce!15796
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 379f2a4be53..6213167ae0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -486,7 +486,6 @@ GEM mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) - mmap2 (2.2.9) mousetrap-rails (1.4.6) multi_json (1.12.2) multi_xml (0.6.0) @@ -623,8 +622,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta39) - mmap2 (~> 2.2, >= 2.2.9) + prometheus-client-mmap (0.7.0.beta43) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) |