Skip to content

EE: reduce merge conflicts in the User model

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

What does this MR do?

This is the EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22697. It includes the CE changes, combined with various EE specific changes to reduce the amount of lines that may conflict in app/models/user.rb when merging CE changes into EE.

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