From f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 15 Mar 2017 18:14:58 -0600
Subject: Better notification emails for notes and (diff) discussions

---
 app/views/layouts/mailer.text.erb  |  4 ++++
 app/views/layouts/mailer.text.haml |  5 -----
 app/views/layouts/notify.text.erb  | 12 ++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 app/views/layouts/mailer.text.erb
 delete mode 100644 app/views/layouts/mailer.text.haml
 create mode 100644 app/views/layouts/notify.text.erb

(limited to 'app/views/layouts')

diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 00000000000..198f30a1dc4
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1,4 @@
+<%= yield -%>
+
+---
+You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
diff --git a/app/views/layouts/mailer.text.haml b/app/views/layouts/mailer.text.haml
deleted file mode 100644
index 6a9c6ced9cc..00000000000
--- a/app/views/layouts/mailer.text.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= yield
-
-You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
-Manage all notifications: #{profile_notifications_url}
-Help: #{help_url}
diff --git a/app/views/layouts/notify.text.erb b/app/views/layouts/notify.text.erb
new file mode 100644
index 00000000000..b4ce02eead8
--- /dev/null
+++ b/app/views/layouts/notify.text.erb
@@ -0,0 +1,12 @@
+<%= yield -%>
+
+---
+<%  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 of your account on <%= Gitlab.config.gitlab.host %>.
-- 
cgit v1.2.1