Refactor how we fetch ref for merge requests

Closes #36089 and #36296

See merge request !13416