diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-05-17 21:56:43 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-05-17 22:07:34 -0500 |
| commit | a21d6ee0c761418ccfdbf40d06c7f5d6d2ac867e (patch) | |
| tree | 9e2c9ec98e1c347faade7e2187740c04897b2347 | |
| parent | 0b946a7bc69058a952a558a9530cd3e8302361e7 (diff) | |
| download | gitlab-ce-a21d6ee0c761418ccfdbf40d06c7f5d6d2ac867e.tar.gz | |
ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget
| -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 06661b930e3..c07bd25e6fd 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; @@ -69,7 +68,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 |