Merge pull request #144 from dwyl/keepInProgressLabelOnMergeConflict

keep in-progress label on merge-conflict #137
dwyl · Sep 1, 2017 · e119e54 · e119e54
2 parents be3ce62 + 38692fe
commit e119e54
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"
         }
     ]