From a48329f4beba325e7776cbfad35fe41c8fcd8102 Mon Sep 17 00:00:00 2001 From: Milka Kuzminski Date: Fri, 13 Nov 2020 11:31:29 +0100 Subject: [PATCH] reviewers: only require a review when we have reviewers defined. - use case is that pr can be created without review needed, maybe just for sharing, or CI checks --- rhodecode/model/pull_request.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index 44f894af..eb0b512c 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -2060,6 +2060,8 @@ class MergeCheck(object): self.error_details = OrderedDict() self.source_commit = AttributeDict() self.target_commit = AttributeDict() + self.reviewers_count = 0 + self.observers_count = 0 def __repr__(self): return ''.format( @@ -2121,11 +2123,12 @@ class MergeCheck(object): # review status, must be always present review_status = pull_request.calculated_review_status() merge_check.review_status = review_status + merge_check.reviewers_count = pull_request.reviewers_count + merge_check.observers_count = pull_request.observers_count status_approved = review_status == ChangesetStatus.STATUS_APPROVED - if not status_approved: + if not status_approved and merge_check.reviewers_count: log.debug("MergeCheck: cannot merge, approval is pending.") - msg = _('Pull request reviewer approval is pending.') merge_check.push_error('warning', msg, cls.REVIEW_CHECK, review_status)