From 38692febc61e1413d6d76ea06ff789e909c2e0ab Mon Sep 17 00:00:00 2001 From: naazy Date: Wed, 9 Aug 2017 14:03:48 +0100 Subject: [PATCH] keep in-progress label on merge-conflict #137 --- web/controllers/rules/pr/merge_conflict.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/controllers/rules/pr/merge_conflict.ex b/web/controllers/rules/pr/merge_conflict.ex index 9777416..3c1970e 100644 --- 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" } ]