summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-07-31 19:01:36 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-08-07 15:23:37 -0300
commit0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch)
tree13970b43017ada593f08b70ca713dc19a1f064cf /changelogs
parentb12107a0b953b566cd58db30ae880800a4a695a6 (diff)
downloadgitlab-ce-0640b3d1d89b7a4eda343eb23b0518a835ac9106.tar.gz
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/31207-clean-locked-merge-requests.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/31207-clean-locked-merge-requests.yml b/changelogs/unreleased/31207-clean-locked-merge-requests.yml
new file mode 100644
index 00000000000..1f52987baef
--- /dev/null
+++ b/changelogs/unreleased/31207-clean-locked-merge-requests.yml
@@ -0,0 +1,4 @@
+---
+title: Unlock stuck merge request and set the proper state
+merge_request: 13207
+author: