Skip to content

Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"

Oswaldo Ferreir requested to merge 31207-clean-locked-merge-requests into master

What does this MR do?

  1. Saves merge_jid on merge_requests
  2. Removes unnecessary locked_at column from merge_requests
  3. Create clean-up worker to update the state of stuck MR's
  4. Add clean-up worker to Cron
  5. Stop using Locked state, use Merging instead

Ala6S93POy

Are there points in the code the reviewer needs to double check?

MergeRequest#locked_at column being removed

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #31207 (closed)

Edited by Oswaldo Ferreir

Merge request reports