keep in-progress label on merge-conflict #137

dwyl · Aug 9, 2017 · 38692fe · 38692fe
1 parent 79e802e
commit 38692fe
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/web/controllers/rules/pr/merge_conflict.ex b/web/controllers/rules/pr/merge_conflict.ex
@@ -33,7 +33,11 @@ defmodule Dwylbot.Rules.PR.MergeConflict do
           url: "#{pr["issue"]["url"]}/assignees"
         },
         %{
-          replace_labels: ["merge-conflicts"],
+          add_labels: ["merge-conflicts"],
+          url: "#{pr["issue"]["url"]}/labels"
+        },
+        %{
+          remove_label: "awaiting-review",
           url: "#{pr["issue"]["url"]}/labels"
         }
     ]