Merge branch 'dz-fix-500-group-git' into 'master'

Fix 500 error when group name ends with git

Closes https://gitlab.com/gitlab-com/support-forum/issues/1298
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742

See merge request !7630