Resolve "`merge_status` is inconsistent across different users and does not refresh on API request"
requested to merge 365299-merge_status-is-inconsistent-across-different-users-and-does-not-refresh-on-api-request into master
What does this MR do and why?
merge_status is inconsistent across different users and does not refresh on API request.
There are two issues here, one is that the cache doesn't get updated when the merge_status of the merge request changes, so the old merge_status is returned. This is fixed by adding the merge_status to the cache key, and the second issue is that when we do cache the object, it means that the recheck mergeability parameter is ignored.
Testing instructions:
Related to #365299 (closed)
Edited by Marc Shaw