diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-18 12:31:59 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-18 12:31:59 +0000 |
| commit | d8dd75ca775f66fd756e43ddd73ac75d39fc3e64 (patch) | |
| tree | 839b6bf06dc5ee10ddc3ff5d1d29cdad196512a5 /app/views | |
| parent | 08b1bff79a6ac91cdf18b5add3ee68e185f5d2fd (diff) | |
| parent | f46fba2b0b2c62528f4484c1c622e1938d3f2e80 (diff) | |
| download | gitlab-ce-d8dd75ca775f66fd756e43ddd73ac75d39fc3e64.tar.gz | |
Merge branch 'rfc-3676-mailsig' into 'master'
set proper signature marker in mails
Closes #43617
See merge request gitlab-org/gitlab-ce!17979
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/mailer.text.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/notify.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb index 198f30a1dc4..8e20c4a4b2a 100644 --- a/app/views/layouts/mailer.text.erb +++ b/app/views/layouts/mailer.text.erb @@ -1,4 +1,4 @@ <%= yield -%> ---- +-- <%# signature marker %> You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. diff --git a/app/views/layouts/notify.text.erb b/app/views/layouts/notify.text.erb index de48f548a1b..9dc490efa9a 100644 --- a/app/views/layouts/notify.text.erb +++ b/app/views/layouts/notify.text.erb @@ -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}" -%> |