kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove superfluous info from invite accepted/declined mails.

Browse source
This commit is contained in:
Douwe Maan 2015-04-14 23:06:21 +02:00
parent c1531fe1d8
commit 88c2639356
8 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/notify/group_invite_accepted_email.html.haml
View file

@ -2,6 +2,5 @@
#{@group_member.invite_email}, now known as
#{link_to @group_member.user.name, user_url(@group_member.user)},
has accepted your invitation to join group
= link_to @group.name, group_url(@group)
as #{@group_member.human_access}.
#{link_to @group.name, group_url(@group)}.

2
app/views/notify/group_invite_accepted_email.text.erb
View file

@ -1,3 +1,3 @@
<%= @group_member.invite_email %>, now known as <%= @group_member.user.name %>, has accepted your invitation to join group <%= @group.name %> as <%= @group_member.human_access %>.
<%= @group_member.invite_email %>, now known as <%= @group_member.user.name %>, has accepted your invitation to join group <%= @group.name %>.
<%= group_url(@group) %>

3
app/views/notify/group_invite_declined_email.html.haml
View file

@ -1,6 +1,5 @@
%p
#{@invite_email}
has declined your invitation to join group
= link_to @group.name, group_url(@group)
as #{Gitlab::Access.options_with_owner.key(@access_level)}.
#{link_to @group.name, group_url(@group)}.

2
app/views/notify/group_invite_declined_email.text.erb
View file

@ -1,3 +1,3 @@
<%= @invite_email %> has declined your invitation to join group <%= @group.name %> as <%= Gitlab::Access.options_with_owner.key(@access_level) %>.
<%= @invite_email %> has declined your invitation to join group <%= @group.name %>.
<%= group_url(@group) %>

3
app/views/notify/project_invite_accepted_email.html.haml
View file

@ -2,6 +2,5 @@
#{@project_member.invite_email}, now known as
#{link_to @project_member.user.name, user_url(@project_member.user)},
has accepted your invitation to join project
= link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)
as #{@project_member.human_access}.
#{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}.

2
app/views/notify/project_invite_accepted_email.text.erb
View file

@ -1,3 +1,3 @@
<%= @project_member.invite_email %>, now known as <%= @project_member.user.name %>, has accepted your invitation to join project <%= @project.name_with_namespace %> as <%= @project_member.human_access %>.
<%= @project_member.invite_email %>, now known as <%= @project_member.user.name %>, has accepted your invitation to join project <%= @project.name_with_namespace %>.
<%= namespace_project_url(@project.namespace, @project) %>

3
app/views/notify/project_invite_declined_email.html.haml
View file

@ -1,6 +1,5 @@
%p
#{@invite_email}
has declined your invitation to join project
= link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)
as #{Gitlab::Access.options_with_owner.key(@access_level)}.
#{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}.

2
app/views/notify/project_invite_declined_email.text.erb
View file

@ -1,3 +1,3 @@
<%= @invite_email %> has declined your invitation to join project <%= @project.name_with_namespace %> as <%= Gitlab::Access.options_with_owner.key(@access_level) %>.
<%= @invite_email %> has declined your invitation to join project <%= @project.name_with_namespace %>.
<%= namespace_project_url(@project.namespace, @project) %>