summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-08 01:47:48 +0000
committerStan Hu <stanhu@gmail.com>2017-08-08 01:47:48 +0000
commitfd40bce9ccad94c3f8fe522a51a771335d95539f (patch)
tree0fb76c147480326f17fb77271628c24794255572 /changelogs
parent4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff)
parenta0c22d1edafbd87d59dbf01acd610da97ec87912 (diff)
downloadgitlab-ce-fd40bce9ccad94c3f8fe522a51a771335d95539f.tar.gz
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
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: