diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-08 00:40:33 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-08 00:40:33 +0000 |
| commit | 017de5c5cf5d78f5f66a174773489642cf8bb5dd (patch) | |
| tree | d228303d8b8e72634eb2e69dff6569edaa5edba5 /Gemfile.lock | |
| parent | d3560d493175ea45df3181917fbcee195a93c0aa (diff) | |
| parent | 15cb9acb5c7b65da7c194ed854ba5100efa28cc0 (diff) | |
| download | gitlab-ce-017de5c5cf5d78f5f66a174773489642cf8bb5dd.tar.gz | |
Merge branch 'pawel/use-released-prometheus-version' into 'master'
Use prometheus-client-mmap released, final version
See merge request gitlab-org/gitlab-ce!16984
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9847c71352a..22c4fc0ef28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,7 +636,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.1.pre.rc.2) + prometheus-client-mmap (0.9.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1132,7 +1132,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.1.pre.rc.2) + prometheus-client-mmap (~> 0.9.1) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |