summaryrefslogtreecommitdiff
path: root/locale/zh_CN
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-10-19 13:43:22 +0000
committerStan Hu <stanhu@gmail.com>2017-10-19 13:43:22 +0000
commitf73efb793233f69a0402ba529410bf52c6105c2c (patch)
tree3932d3ab71ef4acf980e7e3a3dfc1ddec81c207d /locale/zh_CN
parentcccb53223ad252ae75a50eefaba6f6ec90a50614 (diff)
parentf9a4f184f303e881469d892ceea719c13ab7b768 (diff)
downloadgitlab-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 'locale/zh_CN')
0 files changed, 0 insertions, 0 deletions