Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@ensc.de>2018-03-10 21:47:28 +0300
committerEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2018-04-18 12:50:07 +0300
commit931f6e6d5c95b037592a129abaa30a38db1ab53c (patch)
tree818791235c3f7429f850c8bff534b9e7ec2679b9 /app/views
parentf150f262a9dee0ed329adf3fd30ea8a47a5e3c6b (diff)
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>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/mailer.text.erb2
-rw-r--r--app/views/layouts/notify.text.erb2
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}" -%>