From 7385e7cd47f1eaab355d2fd8ca91b9d056b4576d Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Fri, 7 Dec 2018 14:24:37 +0000
Subject: Backports changes made to One notification per code review

The EE merge request can be found here:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8442
---
 app/views/notify/_note_email.html.haml | 23 ++++++++++++++---------
 app/views/notify/_note_email.text.erb  | 13 ++++++++-----
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'app/views/notify')

diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml
index 94bd6f96dbc..1fbae2f64ed 100644
--- a/app/views/notify/_note_email.html.haml
+++ b/app/views/notify/_note_email.html.haml
@@ -1,13 +1,18 @@
-- discussion = @note.discussion if @note.part_of_discussion?
+- note = local_assigns.fetch(:note, @note)
+- diff_limit = local_assigns.fetch(:diff_limit, nil)
+- target_url = local_assigns.fetch(:target_url, @target_url)
+- note_style = local_assigns.fetch(:note_style, "")
+
+- discussion = note.discussion if note.part_of_discussion?
 - diff_discussion = discussion&.diff_discussion?
 - on_image = discussion.on_image? if diff_discussion
 
 - if discussion
   - phrase_end_char = on_image ? "." : ":"
 
-  %p.details
+  %p{ style: "color: #777777;" }
     = succeed phrase_end_char do
-      = link_to @note.author_name, user_url(@note.author)
+      = link_to note.author_name, user_url(note.author)
 
       - if diff_discussion
         - if discussion.new_discussion?
@@ -15,16 +20,16 @@
         - else
           commented on a discussion
 
-        on #{link_to discussion.file_path, @target_url}
+        on #{link_to discussion.file_path, target_url}
       - else
         - if discussion.new_discussion?
           started a new discussion
         - else
-          commented on a #{link_to 'discussion', @target_url}
+          commented on a #{link_to 'discussion', target_url}
 
 - elsif Gitlab::CurrentSettings.email_author_in_body
   %p.details
-    #{link_to @note.author_name, user_url(@note.author)} commented:
+    #{link_to note.author_name, user_url(note.author)} commented:
 
 - if diff_discussion && !on_image
   = content_for :head do
@@ -32,11 +37,11 @@
 
   %table
     = render partial: "projects/diffs/line",
-      collection: discussion.truncated_diff_lines,
+      collection: discussion.truncated_diff_lines(diff_limit: diff_limit),
       as: :line,
       locals: { diff_file: discussion.diff_file,
         plain: true,
         email: true }
 
-%div
-  = markdown(@note.note, pipeline: :email, author: @note.author)
+%div{ style: note_style }
+  = markdown(note.note, pipeline: :email, author: note.author)
diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb
index c319cb55e87..4bf252b6ce1 100644
--- a/app/views/notify/_note_email.text.erb
+++ b/app/views/notify/_note_email.text.erb
@@ -1,6 +1,9 @@
-<%  discussion = @note.discussion if @note.part_of_discussion? -%>
+<% note = local_assigns.fetch(:note, @note) -%>
+<% diff_limit = local_assigns.fetch(:diff_limit, nil) -%>
+
+<%  discussion = note.discussion if note.part_of_discussion? -%>
 <%  if discussion && !discussion.individual_note? -%>
-<%=   @note.author_name -%>
+<%=   note.author_name -%>
 <%    if discussion.new_discussion? -%>
 <%=     " started a new discussion" -%>
 <%    else -%>
@@ -13,14 +16,14 @@
 
 
 <%  elsif Gitlab::CurrentSettings.email_author_in_body -%>
-<%=     "#{@note.author_name} commented:" -%>
+<%=     "#{note.author_name} commented:" -%>
 
 
 <%  end -%>
 <%  if discussion&.diff_discussion? -%>
-<%    discussion.truncated_diff_lines(highlight: false).each do |line| -%>
+<%    discussion.truncated_diff_lines(highlight: false, diff_limit: diff_limit).each do |line| -%>
 <%=     "> #{line.text}\n" -%>
 <%    end -%>
 
 <%  end -%>
-<%= @note.note -%>
+<%= note.note -%>
-- 
cgit v1.2.1