Reduce merge conflicts in the User model
What does this MR do?
This MR makes some changes to the User model, which coupled with changes in EE, will reduce the number of merge conflicts. This in turn should reduce the amount of work necessary to merge CE upstream merge requests, which in turn should speed up the development and release cycle.
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8153
What are the relevant issue numbers?
https://gitlab.com/gitlab-org/release/framework/issues/28
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 -
Conforms to the database guides
Edited by Yorick Peterse