Merge pull request #3192 from Citadel-Station-13/upstream-merge-31307

[MIRROR] Fixes maintainer detection for review auto-tagging
This commit is contained in:
LetterJay
2017-10-07 01:07:12 -04:00
committed by GitHub

View File

@@ -99,12 +99,9 @@ switch (strtolower($_SERVER['HTTP_X_GITHUB_EVENT'])) {
case 'pull_request_review':
if($payload['action'] == 'submitted'){
$lower_state = strtolower($payload['review']['state']);
if(($lower_state == 'approved' || $lower_state == 'changes_requested') && is_maintainer($payload, $payload['review']['user']['login'])){
$lower_association = strtolower($payload['review']['author_association']);
if($lower_association == 'member' || $lower_association == 'contributor' || $lower_association == 'owner')
if(($lower_state == 'approved' || $lower_state == 'changes_requested') && is_maintainer($payload, $payload['review']['user']['login']))
remove_ready_for_review($payload);
}
}
break;
default:
header('HTTP/1.0 404 Not Found');
@@ -286,9 +283,8 @@ function check_ready_for_review($payload, $labels = null){
$reviews_ids_with_changes_requested = array();
$dismissed_an_approved_review = false;
foreach($reviews as $R){
$lower_association = strtolower($R['author_association']);
if($lower_association == 'member' || $lower_association == 'contributor' || $lower_association == 'owner'){
foreach($reviews as $R)
if(is_maintainer($R['user']['login'])){
$lower_state = strtolower($R['state']);
if($lower_state == 'changes_requested')
$reviews_ids_with_changes_requested[] = $R['id'];
@@ -297,7 +293,6 @@ function check_ready_for_review($payload, $labels = null){
$dismissed_an_approved_review = true;
}
}
}
if(!$dismissed_an_approved_review && count($reviews_ids_with_changes_requested) == 0){
if($has_label_already)