Skip to content

Reinstate changes from ac6673dd reverted in d5a24021

Yorick Peterserequested to merge
reinstate-ac6673ddcf into master

The changes in ac6673dd could not be merged automatically into GitLab Enterprise Edition (EE) and have been reverted from GitLab Community Edition (CE) in commit d5a24021.

Original MR: unknown

Steps to follow by the author

@yorickpeterse: to ensure your changes are merged back into CE and can make their way into EE, please follow these steps:

  1. Create the branch ee-reinstate-ac6673ddcf in EE for your changes.
  2. Pull the changes from CE into this branch.
  3. Resolve the merge conflicts.
  4. Create a merge request for EE. Make sure the target branch is set to the correct branch, usually this will be master.
  5. Add the reverted label to the EE merge request.
  6. Add a link to this EE merge request: LINK
  7. Have both the CE and EE merge request reviewed by the appropriate people. Usually you can have them reviewed by the same people that reviewed your original merge request.

Reviewer notes

  • The EE merge request must be merged before the CE merge request, otherwise the changes in this merge request may end up getting reverted again.
  • The ee_compat_check build must pass, otherwise the changes may be reverted again.
  • The link to the EE merge request must be present. This allows everybody to more easily jump between the two merge requests.

Merge request reports