Merge branch 'rfc-3676-mailsig' into 'master'
set proper signature marker in mails Closes #43617 See merge request gitlab-org/gitlab-ce!17979
This commit is contained in:
commit
d8dd75ca77
|
@ -1,4 +1,4 @@
|
|||
<%= yield -%>
|
||||
|
||||
---
|
||||
-- <%# signature marker %>
|
||||
You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<%= yield -%>
|
||||
|
||||
---
|
||||
-- <%# signature marker %>
|
||||
<% if @target_url -%>
|
||||
<% if @reply_by_email -%>
|
||||
<%= "Reply to this email directly or view it on GitLab: #{@target_url}" -%>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Use RFC 3676 mail signature delimiters
|
||||
merge_request: 17979
|
||||
author: Enrico Scholz
|
||||
type: changed
|
Loading…
Reference in New Issue