Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master'
[CE] Fix DiffCheck failing due to invalid string argument See merge request gitlab-org/gitlab-ce!23741
[CE] Fix DiffCheck failing due to invalid string argument See merge request gitlab-org/gitlab-ce!23741