kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'pawel/bump_prometheus_client_library' into 'master' 

Fix bug causing truncation of Metrics files

See merge request !13035
This commit is contained in:
Sean McGivern 2017-07-24 12:11:12 +00:00
parent 3d3951a2ae 87308484fa
commit 7eaef13093
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -591,7 +591,7 @@ GEM
premailer-rails (1.9.7)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
prometheus-client-mmap (0.7.0.beta9)
prometheus-client-mmap (0.7.0.beta10)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)

4
changelogs/unreleased/pawel-fix-metrics-files-handling.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix bug causing metrics files to be truncated
merge_request: 35420
author: