gitlab-org--gitlab-foss/app/views/layouts/notify.text.erb

<%= yield -%>

-- <%# signature marker %>
<%  if @target_url -%>
<%    if @reply_by_email -%>
<%=     "Reply to this email directly or view it on GitLab: #{@target_url}" -%>
<%    else -%>
<%=     "View it on GitLab: #{@target_url}" -%>
<%    end -%>
<%  end -%>

<%= "You're receiving this email because #{notification_reason_text(@reason)}." %>
Better notification emails for notes and (diff) discussions 2017-03-16 00:14:58 +00:00			`<%= yield -%>`

set proper signature marker in mails use rfc 3676 mail signature delimiters ("-- ") instead of the previous "---" one. closes #43617 Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de> 2018-03-10 18:47:28 +00:00			`-- <%# signature marker %>`
Better notification emails for notes and (diff) discussions 2017-03-16 00:14:58 +00:00			`<% if @target_url -%>`
			`<% if @reply_by_email -%>`
			`<%= "Reply to this email directly or view it on GitLab: #{@target_url}" -%>`
			`<% else -%>`
			`<%= "View it on GitLab: #{@target_url}" -%>`
			`<% end -%>`
			`<% end -%>`

Initial work to add notification reason to emails Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent. 2017-12-28 17:25:02 +00:00			`<%= "You're receiving this email because #{notification_reason_text(@reason)}." %>`