summaryrefslogtreecommitdiff
path: root/app/mailers/emails
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 15:16:00 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 15:16:00 +0200
commitcb5362e7ce0496e4fa7bec4ae629fd24e93d721e (patch)
tree4375ae5e99f11d51032559a95c12f1491bcd9e1f /app/mailers/emails
parent0013ea5130494326f37fb1d6988a369fa2c91d22 (diff)
downloadgitlab-ce-cb5362e7ce0496e4fa7bec4ae629fd24e93d721e.tar.gz
Follow newline guidelines.
Diffstat (limited to 'app/mailers/emails')
-rw-r--r--app/mailers/emails/groups.rb7
-rw-r--r--app/mailers/emails/projects.rb6
2 files changed, 13 insertions, 0 deletions
diff --git a/app/mailers/emails/groups.rb b/app/mailers/emails/groups.rb
index 07b8f6d735a..1c43f95dc8c 100644
--- a/app/mailers/emails/groups.rb
+++ b/app/mailers/emails/groups.rb
@@ -3,8 +3,10 @@ module Emails
def group_access_granted_email(group_member_id)
@group_member = GroupMember.find(group_member_id)
@group = @group_member.group
+
@target_url = group_url(@group)
@current_user = @group_member.user
+
mail(to: @group_member.user.notification_email,
subject: subject("Access to group was granted"))
end
@@ -13,8 +15,10 @@ module Emails
@group_member = GroupMember.find group_member_id
@group = @group_member.group
@token = token
+
@target_url = group_url(@group)
@current_user = @group_member.user
+
mail(to: @group_member.invite_email,
subject: "Invitation to join group #{@group.name}")
end
@@ -24,8 +28,10 @@ module Emails
return if @group_member.created_by.nil?
@group = @group_member.group
+
@target_url = group_url(@group)
@current_user = @group_member.created_by
+
mail(to: @group_member.created_by.notification_email,
subject: subject("Invitation accepted"))
end
@@ -37,6 +43,7 @@ module Emails
@current_user = @created_by = User.find(created_by_id)
@access_level = access_level
@invite_email = invite_email
+
@target_url = group_url(@group)
mail(to: @created_by.notification_email,
subject: subject("Invitation declined"))
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 7baeead3fb5..2584e9d48b1 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -3,8 +3,10 @@ module Emails
def project_access_granted_email(project_member_id)
@project_member = ProjectMember.find project_member_id
@project = @project_member.project
+
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.user
+
mail(to: @project_member.user.notification_email,
subject: subject("Access to project was granted"))
end
@@ -13,8 +15,10 @@ module Emails
@project_member = ProjectMember.find project_member_id
@project = @project_member.project
@token = token
+
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.user
+
mail(to: @project_member.invite_email,
subject: "Invitation to join project #{@project.name_with_namespace}")
end
@@ -24,6 +28,7 @@ module Emails
return if @project_member.created_by.nil?
@project = @project_member.project
+
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.created_by
@@ -38,6 +43,7 @@ module Emails
@current_user = @created_by = User.find(created_by_id)
@access_level = access_level
@invite_email = invite_email
+
@target_url = namespace_project_url(@project.namespace, @project)
mail(to: @created_by.notification_email,