Skip to content

Migrates branches_dropdown.vue to GlCollapsibleListbox

What does this MR do and why?

Migrates GlDropdown in app/assets/javascripts/projects/commit/components/branches_dropdown.vue to GlCollapsibleListbox (see #384280 (closed)).

This change was originally part of !106863 (merged) which was subsequently reverted in !109569 (merged) due to master:broken, see gitlab-org/quality/engineering-productivity/master-broken-incidents#668 (closed).

What broke master last time was the e2e test ./spec/features/merge_request/user_sees_merge_widget_spec.rb being skipped due to being flaky. This test then ran again later, breaking master.

I have updated the failing parts of this test as part of this MR.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After
Screenshot_2022-12-12_at_14.46.44 Screenshot_2022-12-13_at_16.44.39
Screenshot_2022-12-14_at_11.36.47 Screenshot_2022-12-14_at_11.26.18
Screenshot_2022-12-12_at_14.46.21 Screenshot_2023-01-11_at_13.44.06

How to set up and validate locally

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

  1. Navigate to project > commits
  2. Select a commit
  3. Select dropdown called "Options" in top right
  4. Select option "Cherry-pick"
  5. Migrated dropdown is the branch dropdown under heading "Pick into branch"

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Related to #384280 (closed)

Edited by Ross Byrne

Merge request reports

Loading