diff options
8 files changed, 8 insertions, 12 deletions
diff --git a/app/views/notify/group_invite_accepted_email.html.haml b/app/views/notify/group_invite_accepted_email.html.haml index d50d182102b..55efad384a7 100644 --- a/app/views/notify/group_invite_accepted_email.html.haml +++ b/app/views/notify/group_invite_accepted_email.html.haml @@ -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)}. diff --git a/app/views/notify/group_invite_accepted_email.text.erb b/app/views/notify/group_invite_accepted_email.text.erb index 0072f5252da..f8b70f7a5a6 100644 --- a/app/views/notify/group_invite_accepted_email.text.erb +++ b/app/views/notify/group_invite_accepted_email.text.erb @@ -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) %> diff --git a/app/views/notify/group_invite_declined_email.html.haml b/app/views/notify/group_invite_declined_email.html.haml index 80f39c3f1ea..f9525d84fac 100644 --- a/app/views/notify/group_invite_declined_email.html.haml +++ b/app/views/notify/group_invite_declined_email.html.haml @@ -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)}. diff --git a/app/views/notify/group_invite_declined_email.text.erb b/app/views/notify/group_invite_declined_email.text.erb index 31cdac0e7fb..6c19a288d15 100644 --- a/app/views/notify/group_invite_declined_email.text.erb +++ b/app/views/notify/group_invite_declined_email.text.erb @@ -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) %> diff --git a/app/views/notify/project_invite_accepted_email.html.haml b/app/views/notify/project_invite_accepted_email.html.haml index 0c01eef7621..7e58d30b10a 100644 --- a/app/views/notify/project_invite_accepted_email.html.haml +++ b/app/views/notify/project_invite_accepted_email.html.haml @@ -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)}. diff --git a/app/views/notify/project_invite_accepted_email.text.erb b/app/views/notify/project_invite_accepted_email.text.erb index 0bbe274931e..fcbe752114d 100644 --- a/app/views/notify/project_invite_accepted_email.text.erb +++ b/app/views/notify/project_invite_accepted_email.text.erb @@ -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) %> diff --git a/app/views/notify/project_invite_declined_email.html.haml b/app/views/notify/project_invite_declined_email.html.haml index dad9f505b9e..c2d7e6f6e3a 100644 --- a/app/views/notify/project_invite_declined_email.html.haml +++ b/app/views/notify/project_invite_declined_email.html.haml @@ -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)}. diff --git a/app/views/notify/project_invite_declined_email.text.erb b/app/views/notify/project_invite_declined_email.text.erb index 06a0013cff5..484687fa51c 100644 --- a/app/views/notify/project_invite_declined_email.text.erb +++ b/app/views/notify/project_invite_declined_email.text.erb @@ -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) %> |