Skip to content

Update merge strategy labels for Mr. Widget

Jose Ivan Vargasrequested to merge
jivanvl-replace-merge-labels-strategies into master

What does this MR do and why?

This updates the labels for the merge button, depending on the merge strategies being used

#359057 (closed)

Screenshots or screen recordings

Without popover

Before After
MWPS Screenshot_2023-02-21_at_12.46.29 MWPS Screenshot_2023-02-21_at_15.14.20
Merge trains with MWPS Screenshot_2023-02-21_at_12.48.03 Merge trains with MWPS Screenshot_2023-02-21_at_15.13.51
Merge trains Screenshot_2023-02-21_at_15.42.16 Merge trains Screenshot_2023-02-21_at_15.20.25

With popover

Before After
MWPS N/A MWPS Screenshot_2023-02-21_at_15.32.12
Merge trains with MWPS Screenshot_2023-02-21_at_15.34.16 Merge trains with MWPS Screenshot_2023-02-21_at_15.33.19
Merge trains Screenshot_2023-02-21_at_15.42.16 **Merge trains ** Screenshot_2023-02-21_at_15.26.06

How to set up and validate locally

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

  1. Have a project configured with a .gitlab-ci.yml file and runner, if you don't have a project I recommend cloning the following project from Fabio's project list https://gitlab.com/fabiopitino/job-log-tester
  2. Create a merge request and while the pipelines are running you can test the MWPS or Merge when pipeline succeeds scenarios, to test the MT and MTWPS (Merge Trains) scenarios, see 3.
  3. To test merge trains go to Settings -> Merge Requests and tick Enable merge results pipelines and Enable merge trains, create a new pipeline for the previous merge request and play around with "Mr. Widget"

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 Jose Ivan Vargas

Merge request reports