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:
Sean McGivern 2018-04-18 12:31:59 +00:00
commit d8dd75ca77
3 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,4 @@
<%= yield -%>
---
-- <%# signature marker %>
You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.

View File

@ -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}" -%>

View File

@ -0,0 +1,5 @@
---
title: Use RFC 3676 mail signature delimiters
merge_request: 17979
author: Enrico Scholz
type: changed