Backport changes from gitlab-ee!7538 (!22093) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Simon Knox requested to merge backport-ee-6036-graphalerts into master Oct 03, 2018

What does this MR do?

Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7538

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

Tests added for this feature/bug
Conforms to the code review guidelines
Conforms to the merge request performance guidelines
Conforms to the style guides