Skip to content

Move portions of some post-merge widgets into the ready to merge widget

What does this MR do and why?

For #344835 (closed).

In !71721 (merged), the ready to merge (pre-merge) UI was made always visible.

Here, we make some adjustments so that:

  • When the feature flag is on and
  • certain components are being displayed

we split up the contents of those four components and re-render the components as children of the outer Ready To Merge widget with a special flag that toggles which part of the component to display.

Screenshots or screen recordings

Before After
Merging merging-before merging-after
Merged merged-before merged-after
Closed closed-before closed-after
Auto-merge Enabled auto-merge-before auto-merge-after

How to set up and validate locally

  1. Enable the restructured_mr_widget feature flag
  2. On lines 582 & 585 of app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue, change each instance of componentName to one of:
    • mr-widget-merging
    • mr-widget-merged
    • mr-widget-closed
    • mr-widget-auto-merge-enabled
  3. View an MR to review the 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 Thomas Randolph

Merge request reports