Skip to content

Fix diffs in text part of email-on-push messages

Stan Hu requested to merge stanhu/gitlab-ee:fix-plaintext-email-diffs into master

This commit was the result of running git cherry-pick 0255322e22b0b6e1bf7507. This was merged into 8.6.3 directly during the time when master was not fully up-to-date. Bringing this back into master since this is an issue with the RC.

safe_diff_files directly modifies @message.diffs and was being called inside the HTML template of the e-mail. By the time the text e-mail rendering occurs, the objects were already wrapped by GitLab's diff helpers. This MR makes it explicit that the diff wrapper will be used in both the text and HTML e-mail templates.

Closes gitlab-org/gitlab-ce#14497

Merge request reports