Skip to content

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 Ratione_rerum_dolore_nihil_quas_ipsum_atque_iure_fuga____6____Merge_requests___Gitlab_Org___Gitlab_Test___GitLab
after Ratione_rerum_dolore_nihil_quas_ipsum_atque_iure_fuga____6____Merge_requests___Gitlab_Org___Gitlab_Test___GitLab

Where is this component?

Ratione_rerum_dolore_nihil_quas_ipsum_atque_iure_fuga____6____Merge_requests___Gitlab_Org___Gitlab_Test___GitLab

How to setup and validate locally (strongly suggested)

  • White box method: change this.isSHAMismatch = this.sha !== mergeRequest.diffHeadSha to this.isSHAMismatch = true in mr_widget_store.js
  • Black box method:
    1. open any MR that is "ready to merge", leave this tab open, here you'll see the ShaMismatch component
    2. in a new tab, use WebIDE to add a new commit to the MR (you can also push the changes from local repository)
    3. go back to the first tab and see the ShaMismatch component (you might have to wait up to a minute)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

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-08-12)

Merge request reports