Skip to content

Make loading spinner Pajamas compliant in mr-conflicts-resolver-app

What does this MR do and why?

This makes the loading spinner Pajamas-compliant in the mr-conflicts-resolver-app component.

Screenshots or screen recordings

It appears that the spinner currently doesn't show up at all on master, so this migration actually fixes a visual bug.

Before After
before after

How to set up and validate locally

  1. Create an MR and make sure some of its changes conflict with the target branch.
  2. In the MR page, click on Resolve conflicts.

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 #353729 (closed)

Merge request reports

Loading