Port of "Fix XSS on commit diff view" for 10-6

See merge request gitlab/gitlabhq!2364