Skip to content

Fix incorrect retry warning when merge trains are enabled

Hordur Freyr Yngvason requested to merge fix-incorrect-merge-request-pipeline-retry-warning into master

What does this MR do and why?

The widget incorrectly used the merge strategy instead of the actual pipeline when setting the merge train status for the warning.

Although the code changes are in GitLab FOSS, the problem and fix are EE-specific because merge trains are EE-only.

See #348912

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

  1. Enable merge trains in a project
  2. Create a merged results pipeline with a job that fails
    • Expected results: The warning as shown in !158283 (merged) should not be present
  3. Now start a merge train that fails
    • Expected results: The warning should be present
Edited by Hordur Freyr Yngvason

Merge request reports