Update ShaMismatch component to match design
What does this MR do?
This MR implements new design of the ShaMismatch
component. It also removes sha-mismatch related code from the ReadyToMerge
component where it lived up until now.
Screenshots or Screencasts (strongly suggested)
before | |
after |
Where is this component?
How to setup and validate locally (strongly suggested)
- White box method: change
this.isSHAMismatch = this.sha !== mergeRequest.diffHeadSha
tothis.isSHAMismatch = true
in mr_widget_store.js - Black box method:
- open any MR that is "ready to merge", leave this tab open, here you'll see the
ShaMismatch
component - in a new tab, use WebIDE to add a new commit to the MR (you can also push the changes from local repository)
- go back to the first tab and see the
ShaMismatch
component (you might have to wait up to a minute)
- open any MR that is "ready to merge", leave this tab open, here you'll see the
Does this MR meet the acceptance criteria?
Conformity
-
I have included changelog trailers, or none are needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Related to #324169 (closed)
Edited by Tomas Vik (OOO back on 2024-11-11)