Make the 'merge ongoing' check more consistent
Currently we can get in a state on the Merge Request widget where we get stuck in This merge request is in the process of being merged
for up to 2 hours (until our cleaup job runs). Ultimately we be should also checking if MergeRequest#merge_jid
is currently being processed by a Sidekiq job, other than just trying to clean its value on every possible error while merging:
Gitlab::SidekiqStatus.num_running([merge_jid]) > 0
Edited by Oswaldo Ferreira