Revert "Merge branch 'revert-e2aa2177' into 'master'" (!23237) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Zeger-Jan van de Weg requested to merge revert-fd6e3781 into master Nov 20, 2018

What does this MR do?

Revert the undoing of my previous MR, with the fixes required to make it work.

What are the relevant issue numbers?

Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/54267

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 merge request performance guidelines
Conforms to the style guides
Conforms to the database guides
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.