diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-04-29 12:22:25 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-03 17:19:16 +0100 |
| commit | 1fb499de278ead55384b13f659a0acfc3680e37f (patch) | |
| tree | f96e024de259b68e04e1e180c81704f14b2f174d /app/views/notify | |
| parent | 7be2796e24e86c421c8988f454c51755b7f3e153 (diff) | |
| download | gitlab-ce-1fb499de278ead55384b13f659a0acfc3680e37f.tar.gz | |
Add leave link to access_granted emailmember-access-granted-leave-email-fe
Allows users to leave a project/group
that they have been added to.
Add function to leave a namespace by url param
If the `leave` param is present on a project/group show page,
click the leave link.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/member_access_granted_email.html.haml | 11 | ||||
| -rw-r--r-- | app/views/notify/member_access_granted_email.text.erb | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/views/notify/member_access_granted_email.html.haml b/app/views/notify/member_access_granted_email.html.haml index 18dec806539..1c50dba9c97 100644 --- a/app/views/notify/member_access_granted_email.html.haml +++ b/app/views/notify/member_access_granted_email.html.haml @@ -1,3 +1,10 @@ +- link_end = '</a>'.html_safe +- source_type = member_source.model_name.singular +- leave_link = polymorphic_url([member_source], leave: 1) +- source_link = link_to(member_source.human_name, member_source.web_url, target: '_blank', rel: 'noopener noreferrer') + %p - You have been granted #{member.human_access} access to the - #{link_to member_source.human_name, member_source.web_url} #{member_source.model_name.singular}. + = _('You have been granted %{access_level} access to the %{source_link} %{source_type}.').html_safe % { access_level: member.human_access, source_link: source_link, source_type: source_type } +%p + - leave_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: leave_link } + = _('If this was a mistake you can %{leave_link_start}leave the %{source_type}%{link_end}.').html_safe % { source_type: source_type, leave_link_start: leave_link_start, link_end: link_end } diff --git a/app/views/notify/member_access_granted_email.text.erb b/app/views/notify/member_access_granted_email.text.erb index a9fb3a589a5..445009bb413 100644 --- a/app/views/notify/member_access_granted_email.text.erb +++ b/app/views/notify/member_access_granted_email.text.erb @@ -1,3 +1,8 @@ -You have been granted <%= member.human_access %> access to the <%= member_source.human_name %> <%= member_source.model_name.singular %>. +<% source_type = member_source.model_name.singular %> +<%= _('You have been granted %{access_level} access to the %{source_name} %{source_type}.') % { access_level: member.human_access, source_name: member_source.human_name, source_type: source_type } %> <%= member_source.web_url %> + +<%= _('If this was a mistake you can leave the %{source_type}.') % { source_type: source_type } %> + +<%= polymorphic_url([member_source], leave: 1) %> |