Merge pull request #51 from wilzbach/remove-needs-rebase

Remove 'needs rebase' and 'needs work' on new push

Author: andralex

source/dlangbot/app.d

@@ -181,7 +181,9 @@ void handlePR(string action, PullRequest pr)
             return;
         if (action == "synchronize")
         {
-            checkAndRemoveMergeLabels(labelsAndCommits.labels, pr);
+            enum toRemoveLabels = ["auto-merge", "auto-merge-squash",
+                                   "needs rebase", "needs work"];
+            checkAndRemoveLabels(labelsAndCommits.labels, pr, toRemoveLabels);
             if (labelsAndCommits.commits !is null)
                 commits = labelsAndCommits.commits;
         }

source/dlangbot/github.d

@@ -229,11 +229,11 @@ Json[] tryMerge(in ref PullRequest pr, MergeMethod method)
     return commits;
 }
 
-void checkAndRemoveMergeLabels(Json[] labels, in ref PullRequest pr)
+void checkAndRemoveLabels(Json[] labels, in ref PullRequest pr, in string[] toRemoveLabels)
 {
     labels
         .map!(l => l["name"].get!string)
-        .filter!(n => n.startsWith("auto-merge"))
+        .filter!(n => toRemoveLabels.canFind(n))
         .each!(l => pr.removeLabel(l));
 }