Commit 348afcd5 authored by Fatih Acet's avatar Fatih Acet

Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' into 'master'

Resolve "Follow-up from "Add "SHA mismatch" state to the MR widget""

Closes #32480

See merge request !11466
parents 12e77890 a21d6ee0
...@@ -4,7 +4,7 @@ import { getStateKey } from '../dependencies'; ...@@ -4,7 +4,7 @@ import { getStateKey } from '../dependencies';
export default class MergeRequestStore { export default class MergeRequestStore {
constructor(data) { constructor(data) {
this.startingSha = data.diff_head_sha; this.sha = data.diff_head_sha;
this.setData(data); this.setData(data);
} }
...@@ -16,7 +16,6 @@ export default class MergeRequestStore { ...@@ -16,7 +16,6 @@ export default class MergeRequestStore {
this.targetBranch = data.target_branch; this.targetBranch = data.target_branch;
this.sourceBranch = data.source_branch; this.sourceBranch = data.source_branch;
this.mergeStatus = data.merge_status; this.mergeStatus = data.merge_status;
this.sha = data.diff_head_sha;
this.commitMessage = data.merge_commit_message; this.commitMessage = data.merge_commit_message;
this.commitMessageWithDescription = data.merge_commit_message_with_description; this.commitMessageWithDescription = data.merge_commit_message_with_description;
this.commitsCount = data.commits_count; this.commitsCount = data.commits_count;
...@@ -69,7 +68,7 @@ export default class MergeRequestStore { ...@@ -69,7 +68,7 @@ export default class MergeRequestStore {
this.canMerge = !!data.merge_path; this.canMerge = !!data.merge_path;
this.canCreateIssue = currentUser.can_create_issue || false; this.canCreateIssue = currentUser.can_create_issue || false;
this.canCancelAutomaticMerge = !!data.cancel_merge_when_pipeline_succeeds_path; this.canCancelAutomaticMerge = !!data.cancel_merge_when_pipeline_succeeds_path;
this.hasSHAChanged = this.sha !== this.startingSha; this.hasSHAChanged = this.sha !== data.diff_head_sha;
this.canBeMerged = data.can_be_merged || false; this.canBeMerged = data.can_be_merged || false;
// Cherry-pick and Revert actions related // Cherry-pick and Revert actions related
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment