summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-09-27 17:38:23 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-09-27 17:56:51 -0300
commite38dc10c09ac6e6d7752d2bb9eeb0c3feab9765a (patch)
treef7dc3283615bb00dc81c5b12196d2cf3512a7fec /changelogs
parent38a848be1c1ea5cba3112def8b3d64a2af056f0e (diff)
downloadgitlab-ce-e38dc10c09ac6e6d7752d2bb9eeb0c3feab9765a.tar.gz
Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-process
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/38476-improve-merge-jid-cleanup-on-merge-process.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/38476-improve-merge-jid-cleanup-on-merge-process.yml b/changelogs/unreleased/38476-improve-merge-jid-cleanup-on-merge-process.yml
new file mode 100644
index 00000000000..43dec51029b
--- /dev/null
+++ b/changelogs/unreleased/38476-improve-merge-jid-cleanup-on-merge-process.yml
@@ -0,0 +1,5 @@
+---
+title: Adjust MRs being stuck on "process of being merged" for more than 2 hours
+merge_request:
+author:
+type: fixed