Skip to content

Remove refactor_merge_service feature flag

Hordur Freyr Yngvason requested to merge remove-ff-refactor-merge-service into master

What does this MR do and why?

This completes the refactoring of MergeRequests::MergeService where the merge operation was extracted into a configurable "merge strategy".

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

  1. Create and merge a merge requests using a variety of merge methods and squashes

MR acceptance checklist

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

Edited by Hordur Freyr Yngvason

Merge request reports