summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-11-06 09:05:50 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-11-06 09:05:50 +0000
commit8e28185b1660a5df86c6de6d3256c6cb77944341 (patch)
tree4f99b156e78e34fbf14848e4f26b132d5a07f85f
parent363900a3e7902cbda8f62b55eb2c30881b3dae3f (diff)
parentc468461579f0dedc0ad92609e6bb54624c2e2b04 (diff)
downloadgitlab-ce-8e28185b1660a5df86c6de6d3256c6cb77944341.tar.gz
Merge branch 'one-link-in-emails' into 'master'
Only have one link in emails to make clicking it easier. See merge request !1937
-rw-r--r--app/views/layouts/notify.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 854cda57c39..f58b9bd6ba6 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -40,9 +40,9 @@
Reply to this email directly or
#{link_to "view it on GitLab", @target_url}.
- else
- #{link_to "View it on GitLab", @target_url}
+ #{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}.
+ You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
If you'd like to receive fewer emails, you can adjust your notification settings.
= email_action @target_url