summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-19 10:54:37 +0000
committerRobert Speicher <rspeicher@gmail.com>2015-10-19 12:56:33 +0200
commit592d1b3190f5d26cc886a5bb599663ade1ca909e (patch)
tree7f80a2662a36a18e9304a127310e81c432d968fb
parent06cb51340eedf47707143ea236ba4a1488b45da7 (diff)
downloadgitlab-ce-592d1b3190f5d26cc886a5bb599663ade1ca909e.tar.gz
Merge branch 'notify-footer' into 'master'
Restore notification footer text See merge request !1640
-rw-r--r--app/views/layouts/notify.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 2f7d7e86f56..854cda57c39 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -41,4 +41,8 @@
#{link_to "view it on GitLab", @target_url}.
- else
#{link_to "View it on GitLab", @target_url}
+ %br
+ You're receiving this email because of your account on #{link_to Gitlab.config.gitlab.host, root_url}.
+ If you'd like to receive fewer emails, you can adjust your notification settings.
+
= email_action @target_url