summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-15 10:36:25 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-15 10:36:25 +0000
commitca0691ca8ee7e3de15eef8c3f9a738a5f6160556 (patch)
tree7549810bd3829c3570539609f312c839cc676b5a
parentf2040c29511eda5c7e074c58c8fb918895e0d8c9 (diff)
parent049cb4bf894840c38c8ad54be800e552028b0310 (diff)
downloadgitlab-ce-ca0691ca8ee7e3de15eef8c3f9a738a5f6160556.tar.gz
Merge branch 'prevent-two-links-in-emails' into 'master'
Prevent-two-links-in-emails Only one link per email to prevent clicking the wrong one.
-rw-r--r--app/views/layouts/notify.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 3e8dae0b230..991d4f0c6d8 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -21,6 +21,6 @@
\—
%br
- if @project
- You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
+ You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, project_url(@project)} project team.
- if @target_url
#{link_to "View it on GitLab", @target_url}