diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-23 11:31:07 +0000 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-05-23 19:26:47 +0530 |
| commit | b0358caa2cca761be404344b98aa3df8d6a2e10c (patch) | |
| tree | aa345af96eda72897d9629d19683f7cd6bf62be1 /app | |
| parent | 12fb0a63b00abec7929b207c01f9f4556534588b (diff) | |
| download | gitlab-ce-b0358caa2cca761be404344b98aa3df8d6a2e10c.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 05e67706983..1533c857863 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -4,7 +4,7 @@ import { getStateKey } from '../dependencies'; export default class MergeRequestStore { constructor(data) { - this.startingSha = data.diff_head_sha; + this.sha = data.diff_head_sha; this.setData(data); } @@ -16,7 +16,6 @@ export default class MergeRequestStore { this.targetBranch = data.target_branch; this.sourceBranch = data.source_branch; this.mergeStatus = data.merge_status; - this.sha = data.diff_head_sha; this.commitMessage = data.merge_commit_message; this.commitMessageWithDescription = data.merge_commit_message_with_description; this.commitsCount = data.commits_count; @@ -68,7 +67,7 @@ export default class MergeRequestStore { this.canMerge = !!data.merge_path; this.canCreateIssue = currentUser.can_create_issue || false; 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; // Cherry-pick and Revert actions related |