diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt index b49d00bc913e..f867ffb35b40 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt @@ -99,15 +99,15 @@ class GHPRReviewFlowViewModelImpl internal constructor( !securityService.isMergeForbiddenForProject() override val isMergeAllowed: Flow = mergeabilityState.map { mergeabilityState -> - mergeabilityState?.canBeMerged == true && securityService.isMergeAllowed() + mergeabilityState?.isRestricted == false && mergeabilityState.canBeMerged && securityService.isMergeAllowed() } override val isRebaseAllowed: Flow = mergeabilityState.map { mergeabilityState -> - mergeabilityState?.canBeRebased == true && securityService.isRebaseMergeAllowed() + mergeabilityState?.isRestricted == false && mergeabilityState.canBeRebased && securityService.isRebaseMergeAllowed() } override val isSquashMergeAllowed: Flow = mergeabilityState.map { mergeabilityState -> - mergeabilityState?.canBeMerged == true && securityService.isSquashMergeAllowed() + mergeabilityState?.isRestricted == false && mergeabilityState.canBeMerged && securityService.isSquashMergeAllowed() } override fun mergeReview() = runAction {