Merge branch 'ph/mergeChecksAutoMergeError' into 'master'

Fixes an error with auto merge when checks pass

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141858



Merged-by: Marc Shaw <mshaw@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>