Skip to content

Split rebase action buttons into two separate buttons

Kev 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
image image

How to set up and validate locally

  1. In the rails console, enable the Rebase without pipeline button 
    Feature.enable(:rebase_without_ci_ui)
  2. Go to a project
  3. Set up CI
  4. Go to settings
  5. Under Merge requests, enable Fast-forward merges
  6. Create a merge request towards the default branch (best: changing an existing file)
  7. Commit a change (best: a new file) to the default branch
  8. See that the buttons are now split (see Screenshots in this MR)
  9. Click on the chevron-down button directly next to the Rebase button
  10. Select Rebase without pipeline
  11. 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.

Edited by Kev

Merge request reports