Split rebase action buttons into two separate buttons
requested to merge KevSlashNull/gitlab:349873-Split-rebase-action-buttons-into-two-separate-buttons into master
What does this MR do and why?
This MR splits the Rebase action buttons in the MR rebase widget into two separate buttons.
This also vertically centers the information message (“Merge blocked: the source branch must be rebased onto the target branch.”) because it being slightly off-center bugged me.
Related to #349873 (closed)
Screenshots or screen recordings
Before | After |
---|---|
How to set up and validate locally
- In the rails console, enable the Rebase without pipeline button
Feature.enable(:rebase_without_ci_ui)
- Go to a project
- Set up CI
- Go to settings
- Under Merge requests, enable Fast-forward merges
- Create a merge request towards the default branch (best: changing an existing file)
- Commit a change (best: a new file) to the default branch
- See that the buttons are now split (see Screenshots in this MR)
- Click on the chevron-down button directly next to the Rebase button
- Select Rebase without pipeline
- Perform a rebase without triggering CI (beware of #349362 (closed))
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 Kev