From 2da8bc3de9f8b63bd80a081c7e2880adee3edb71 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 24 Feb 2017 15:56:41 +0000 Subject: Only create unmergeable todos once Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it. --- changelogs/unreleased/only-create-unmergeable-todo-once.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/only-create-unmergeable-todo-once.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/only-create-unmergeable-todo-once.yml b/changelogs/unreleased/only-create-unmergeable-todo-once.yml new file mode 100644 index 00000000000..e675ed945ad --- /dev/null +++ b/changelogs/unreleased/only-create-unmergeable-todo-once.yml @@ -0,0 +1,4 @@ +--- +title: Only create unmergeable todos once when MR fails to merge +merge_request: +author: -- cgit v1.2.1