diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-15 18:14:58 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3 (patch) | |
| tree | 2291c4c92889f11e1bdbabe640205debb1e88029 /app/views/layouts | |
| parent | 76aa0bedd7ed3aaaeab9402b78261917df66de10 (diff) | |
| download | gitlab-ce-f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3.tar.gz | |
Better notification emails for notes and (diff) discussions
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/mailer.text.erb | 4 | ||||
| -rw-r--r-- | app/views/layouts/mailer.text.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/notify.text.erb | 12 |
3 files changed, 16 insertions, 5 deletions
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 %>. |