diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 4 |
1 files changed, 1 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 350b7a98d2a..2b45aabd35d 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 @@ -11,7 +11,6 @@ export default class MergeRequestStore { setData(data) { const currentUser = data.current_user; const pipelineStatus = data.pipeline ? data.pipeline.details.status : null; - const mergeParams = data.merge_params || {}; this.title = data.title; this.targetBranch = data.target_branch; @@ -52,8 +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 = mergeParams.should_remove_source_branch || - mergeParams.force_remove_source_branch === '1' || false; + this.shouldRemoveSourceBranch = data.remove_source_branch; this.onlyAllowMergeIfPipelineSucceeds = data.only_allow_merge_if_pipeline_succeeds || false; this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false; this.mergePath = data.merge_path; |