Skip to content

Draft: Add Dedicated MergeTrains::MergeService class for skip-train merges

drew stachon requested to merge dedicated-merge-train-merge-service into master

What does this MR do and why?

This MR moves the skip-train functionality into it's own service class and removes the after_merge override from EE::MergeRequests::MergeService.

It's better encapsulation to keep MergeTrain feature logic out of the underlying MergeRequest operation sevices, and also avoids a race condition that is theoretically possible by creating the MergeTrains::Car after the requested merge.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Merge request reports