Commit cbdfced2 authored by Nikola Milojevic's avatar Nikola Milojevic

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
parents f8e3e133 9cf4df73
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
- else - else
= link_to 'discussion', target_url = link_to 'discussion', target_url
- if include_stylesheet_link && discussion&.diff_discussion? && discussion.on_text? - if discussion&.diff_discussion? && discussion.on_text?
= content_for :head do - if include_stylesheet_link
= stylesheet_link_tag 'mailers/highlighted_diff_email' = content_for :head do
= stylesheet_link_tag 'mailers/highlighted_diff_email'
%table.code.gl-mb-5 %table.code.gl-mb-5
= render partial: "projects/diffs/email_line", = render partial: "projects/diffs/email_line",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment