backport changes from gitlab-ee!7903 (!22767) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Simon Knox requested to merge ee-backport-4753-tracing-mvc into master Nov 02, 2018

What does this MR do?

Fix CE conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7903

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/4753

Does this MR meet the acceptance criteria?

~~Changelog entry added, if necessary~~
Documentation created/updated
Tests added for this feature/bug
Conforms to the code review guidelines
Conforms to the database guides
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.