diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-05-10 12:31:36 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-05-10 12:31:36 +0000 |
| commit | b7e9c968c24e5d380f5522067e46170a351c6b6c (patch) | |
| tree | d498cbfb40e87b1c93bc4abb7ab389671a6200a1 /Gemfile.lock | |
| parent | 3016cf26970353626db8437fb77a3ac22f83288c (diff) | |
| parent | 204af2e1019e661fddc451ad0cfb982453d4085b (diff) | |
| download | gitlab-ce-b7e9c968c24e5d380f5522067e46170a351c6b6c.tar.gz | |
Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'
Support resetting of Prometheus metrics between test runs
Closes #39968
See merge request gitlab-org/gitlab-ce!18836
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 ee28465decd..201dba5fc5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -632,7 +632,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.1) + prometheus-client-mmap (0.9.2) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1130,7 +1130,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.1) + prometheus-client-mmap (~> 0.9.2) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |