Backport of CE upstream - 2018-10-05 12:21 UTC (!22154) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Kamil Trzciński requested to merge backport-ce-to-ee-merge into master Oct 05, 2018

What does this MR do?

What are the relevant issue numbers?

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