Merge branch 'one-link-in-emails' into 'master'

Only have one link in emails to make clicking it easier. See merge request !1937

Merge branch 'one-link-in-emails' into 'master'
8e28185b · Dmitriy Zaporozhets · 363900a3 · c4684615 · 8e28185b
Commit 8e28185b authored Nov 06, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

notify.html.haml app/views/layouts/notify.html.haml +2 -2

No files found.
--- 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