summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-19 10:54:37 +0000
committerRobert Speicher <robert@gitlab.com>2015-10-19 10:54:37 +0000
commit904c11ef912145e81f46133927f28c88971162ba (patch)
tree5d92273c7b8018cb1202f74abf912671c2caa629
parent3104adbbfd9999d3d27ae248d2c8b0e60f058236 (diff)
parent85264ab6a9fa11a2e325d72c02c00d4b8862f933 (diff)
downloadgitlab-ce-904c11ef912145e81f46133927f28c88971162ba.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