Skip to content

Fix conflicts for the "developers can merge" feature

Timothy Andrew requested to merge developers-can-merge into master
  • This feature was implemented for CE in gitlab-org/gitlab-ce!4892.
  • It was reverted in CE-master because of merge conflicts with EE-master
  • This MR fixes the conflicts. Once this is merged in, the feature can be reintroduced to CE-master

/cc @rymai @rspeicher

Merge request reports