Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-17 16:58:36 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-05-17 16:58:36 +0300
commitfd5fdb2c1aba95b8dc851e80cb7216551052122d (patch)
tree745d4a60a5f029644767cee9e8284b514fcb5a5a /app/views/notify
parent42189e9185e59758deb93ea4ea625e2dc6f99524 (diff)
parentec7163ae1db54f4adce7942673abc8a4a073fbd6 (diff)
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/notify')
-rw-r--r--app/views/notify/member_invited_email.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/member_invited_email.html.haml b/app/views/notify/member_invited_email.html.haml
index b8b75da3f2f..6730172242b 100644
--- a/app/views/notify/member_invited_email.html.haml
+++ b/app/views/notify/member_invited_email.html.haml
@@ -4,7 +4,7 @@
by
= link_to member.created_by.name, user_url(member.created_by)
to join the
- = link_to member_source.human_name, member_source.web_url
+ = link_to member_source.human_name, member_source.public? ? member_source.web_url : invite_url(@token)
#{member_source.model_name.singular} as #{member.human_access}.
%p