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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 89023b1cbf1..27a76dc36cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,7 +623,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta14) + prometheus-client-mmap (0.7.0.beta17) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1106,7 +1106,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta14) + prometheus-client-mmap (~> 0.7.0.beta17) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |