Merge branch 'ps-fix-diff-not-showing-in-review-emails' into 'master'

Fix diff not rendering for MR review email

See merge request gitlab-org/gitlab!84808

app/views/notify/_note_email.html.haml

@@ -23,7 +23,8 @@
       - else
         = link_to 'discussion', target_url
 
-- if include_stylesheet_link && discussion&.diff_discussion? && discussion.on_text?
+- if discussion&.diff_discussion? && discussion.on_text?
+  - if include_stylesheet_link
     = content_for :head do
       = stylesheet_link_tag 'mailers/highlighted_diff_email'