Resolve "Lock issue and merge request"

Closes #18608

See merge request gitlab-org/gitlab-ce!14531