Skip to content

Reduce merge conflicts in the User model

Yorick Peterse requested to merge user-model-merge-conflicts into master

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?

Edited by Yorick Peterse

Merge request reports