1 files changed, 7 insertions, 15 deletions
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index de3f32e6415..75250b0383d 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,15 +1,7 @@
-= content_for :head do
-  = stylesheet_link_tag 'mailers/highlighted_diff_email'
-
-- if @note.diff_note? && @note.diff_file
-  %p.details
-    New comment on diff for
-    = link_to @note.diff_file.file_path, @target_url
-    \:
-
-    .diff-content.code.js-syntax-highlight
-      %table
-        - Discussion.new([@note]).truncated_diff_lines.each do |line|
-          = render "projects/diffs/line", line: line, diff_file: @note.diff_file, plain: true
-
-= render 'note_message'
+%p.details
+  New comment for Merge Request
+  = @merge_request.to_reference
+  on
+  = render partial: 'note_mr_or_commit_email',
+    locals: { note: @note,
+    discussion: @discussion}