7385e7cd47
The EE merge request can be found here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8442
47 lines
1.5 KiB
Text
47 lines
1.5 KiB
Text
- 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{ style: "color: #777777;" }
|
|
= succeed phrase_end_char do
|
|
= link_to note.author_name, user_url(note.author)
|
|
|
|
- if diff_discussion
|
|
- if discussion.new_discussion?
|
|
started a new discussion
|
|
- else
|
|
commented on a discussion
|
|
|
|
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}
|
|
|
|
- elsif Gitlab::CurrentSettings.email_author_in_body
|
|
%p.details
|
|
#{link_to note.author_name, user_url(note.author)} commented:
|
|
|
|
- if diff_discussion && !on_image
|
|
= content_for :head do
|
|
= stylesheet_link_tag 'mailers/highlighted_diff_email'
|
|
|
|
%table
|
|
= render partial: "projects/diffs/line",
|
|
collection: discussion.truncated_diff_lines(diff_limit: diff_limit),
|
|
as: :line,
|
|
locals: { diff_file: discussion.diff_file,
|
|
plain: true,
|
|
email: true }
|
|
|
|
%div{ style: note_style }
|
|
= markdown(note.note, pipeline: :email, author: note.author)
|