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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -294,7 +294,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.1' + gem 'prometheus-client-mmap', '~> 0.9.2' gem 'raindrops', '~> 0.18' end |