diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-19 13:43:22 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-19 13:43:22 +0000 |
| commit | f73efb793233f69a0402ba529410bf52c6105c2c (patch) | |
| tree | 3932d3ab71ef4acf980e7e3a3dfc1ddec81c207d /Gemfile | |
| parent | cccb53223ad252ae75a50eefaba6f6ec90a50614 (diff) | |
| parent | f9a4f184f303e881469d892ceea719c13ab7b768 (diff) | |
| download | gitlab-ce-f73efb793233f69a0402ba529410bf52c6105c2c.tar.gz | |
Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master'
Update Prometheus gem to fix problems with other Processes overwriting current metrics file
Closes #36714
See merge request gitlab-org/gitlab-ce!14827
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta14' + gem 'prometheus-client-mmap', '~>0.7.0.beta17' gem 'raindrops', '~> 0.18' end |