summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-05-25 12:47:06 -0400
committerBryce Johnson <bryce@gitlab.com>2017-05-25 12:47:06 -0400
commit08a7073eb890f9a885aa6a78caefcec3090644b2 (patch)
tree96fdbf7cd6752d3097144dce5e6a1f4ebb4d20e8
parent8b746c22f74cb8728f8a6201adf9c95dd95194bc (diff)
downloadgitlab-ce-08a7073eb890f9a885aa6a78caefcec3090644b2.tar.gz
Fallback to false when remove_source_branch is null.
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js2
1 files changed, 1 insertions, 1 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 2b45aabd35d..4833fb325af 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
@@ -51,7 +51,7 @@ export default class MergeRequestStore {
this.cancelAutoMergePath = data.cancel_merge_when_pipeline_succeeds_path;
this.removeWIPPath = data.remove_wip_path;
this.sourceBranchRemoved = !data.source_branch_exists;
- this.shouldRemoveSourceBranch = data.remove_source_branch;
+ this.shouldRemoveSourceBranch = data.remove_source_branch || false;
this.onlyAllowMergeIfPipelineSucceeds = data.only_allow_merge_if_pipeline_succeeds || false;
this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false;
this.mergePath = data.merge_path;