cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-09 23:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict tags aren't touched if github doesn't calculate them in time

Browse Source
This commit is contained in:
Kyle Spier-Swenson
2017-04-22 11:45:57 -07:00
committed by GitHub
parent ae8b22c49e
commit 53f0db39b9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/github_webhook_processor.php
+2 -2
View File
@@ -141,9 +141,9 @@ function tag_pr($payload, $opened) {
$remove = array();
$mergeable = $payload['pull_request']['mergeable'];
if($mergeable == null || $mergeable) //only look for the false value
if($mergeable === TRUE) //only look for the false value
$remove[] = 'Merge Conflict';
else
else if ($mergable === FALSE)
$tags[] = 'Merge Conflict';
if(has_tree_been_edited($payload, '_maps'))