Update merge strategy labels for Mr. Widget
What does this MR do and why?
This updates the labels for the merge button, depending on the merge strategies being used
Screenshots or screen recordings
Without popover
Before | After |
---|---|
MWPS | MWPS |
Merge trains with MWPS | Merge trains with MWPS |
Merge trains | Merge trains |
With popover
Before | After |
---|---|
MWPS N/A | MWPS |
Merge trains with MWPS | Merge trains with MWPS |
Merge trains | **Merge trains ** |
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
- 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
- Create a merge request and while the pipelines are running you can test the
MWPS
orMerge when pipeline succeeds
scenarios, to test theMT
andMTWPS
(Merge Trains) scenarios, see 3. - To test merge trains go to
Settings -> Merge Requests
and tickEnable merge results pipelines
andEnable 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.
-
I have evaluated the MR acceptance checklist for this MR.
Edited by Jose Ivan Vargas