Fix conflict when picking `bump prometheus-client-mmap to 0.9.3 to fix nil exception error` to patch stable branch (!19105) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Filipa Lacerda requested to merge 10-8-stable-patch-1-fix-conflict into 10-8-stable-patch-1 May 23, 2018

Fix conflict when picking bump prometheus-client-mmap to 0.9.3 to fix nil exception error https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19085/diffs to patch stable branch https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19083