CE upstream - 2018-07-03 21:01 UTC
Files to resolve:
-
🏝 Toon Claes🏝 OoO - July 16 Please resolve (UU)doc/administration/monitoring/prometheus/gitlab_metrics.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-03
branch.
Thanks in advance!
@godfat After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Stan Hu