Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master'

Prevent people from adding the link back.



See merge request !1938

app/views/layouts/notify.html.haml

@@ -42,7 +42,8 @@
           - else
             #{link_to "View it on GitLab", @target_url}.
           %br
+          -# Don't link the host is the line below, one link in the email is easier to quickly click than two.
           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
+          = email_action @target_url
\ No newline at end of file