fix: remove automerge from queue if case is unchecked

christophehurpeau · Jun 28, 2019 · 8601e00 · 8601e00
1 parent 241fb0d
commit 8601e00
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/pr-handlers/actions/editOpenedPR.ts b/src/pr-handlers/actions/editOpenedPR.ts
@@ -177,6 +177,7 @@ export const editOpenedPR = async (
         await context.github.issues.removeLabel(
           context.issue({ name: automergeLabel.name }),
         );
+        repoContext.removePrFromAutomergeQueue(context, pr.number);
       }
       if (options.autoMerge && !prHasAutoMergeLabel) {
         const result = await context.github.issues.addLabels(
@@ -188,8 +189,8 @@ export const editOpenedPR = async (
           context.payload.pull_request,
           result.data,
         );
-        return { skipAutoMerge: true };
       }
+      return { skipAutoMerge: true };
     }
   }