diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index e34060c3393a28c8dd96850fc91ca7aa01a915f3..11159423378cca7e6e7982328f7c7b653aeba56e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -104,6 +104,14 @@ export default { const { commitsCount, enableSquashBeforeMerge } = this.mr; return enableSquashBeforeMerge && commitsCount > 1; }, + isSquashButtonSelected() { + return this.mr.squashValueDefault; + }, + isSquashButtonDisabled() { + console.log(this.mr.squashValueReadonly); + console.log(this.mr); + return this.isMergeButtonDisabled || this.mr.squashValueReadonly; + }, shouldShowMergeControls() { return this.mr.isMergeAllowed || this.isAutoMergeAvailable; }, @@ -339,7 +347,7 @@ export default { v-if="shouldShowSquashBeforeMerge" v-model="squashBeforeMerge" :help-path="mr.squashBeforeMergeHelpPath" - :is-disabled="isMergeButtonDisabled" + :is-disabled="isSquashButtonDisabled" />