Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,10 @@ private function updateReviewStatus(
// reviewer resigns or is removed.
$new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
} else if ($was_revision) {
// This revision was "Needs Revision", but no longer has any rejecting
// This revision no longer has any rejecting
// reviewers. This usually happens after the last rejecting reviewer
// resigns or is removed. Put the revision back in "Needs Review".
$new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
// resigns or is removed. Put the revision in "Changes Planned".
$new_status = DifferentialRevisionStatus::CHANGES_PLANNED;
}

if ($new_status === null) {
Expand Down Expand Up @@ -536,6 +536,10 @@ protected function shouldPublishFeedStory(
protected function shouldSendMail(
PhabricatorLiskDAO $object,
array $xactions) {
// Don't notify reviewers for revisions in "changes planned" / "request changes" state
if ($object->isChangePlanned() || $object->isNeedsRevision()) {
return false;
}
return true;
}

Expand Down