Skip to content

Draft: Fix edge cases in auto merge when on merge train

Hordur Freyr Yngvason requested to merge fix-auto-merge-edge-cases-when-on-train into master

What does this MR do and why?

Auto merge could sometimes dispatch the wrong service, resulting in abrupt removals from the merge train and misleading system notes.

These bugs probably surfaced now because of two things:

  1. gitlab-org/gitlab dogfooding the feature with a tight feedback loop
  2. the scope of auto merge having recently expanded, resulting in more calls to the buggy code.

See #466033

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

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.

Merge request reports