The source project of this merge request has been removed.
Fix ce-to-ee-2018-10-30 MR by pulling in missed EE Port commits
What does this MR do?
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8151 is failing because https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22414 was merged without merging the EE port https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7964 first. This will bring the EE Port changes into ce-to-ee-2018-10-30 to resolve the failing tests.
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 -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
EE specific content should be in the top level /eefolder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan?