summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 15:23:38 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 12:08:10 +0200
commit717fa136a5146d45660d3d97f5671352a47a0601 (patch)
treefe5bd4660f8d68b7518df21647e05b9e2ab1ed19 /app/mailers
parent39f389ae0fff5706b73b03c8fb5fc4e3dd7da638 (diff)
downloadgitlab-ce-717fa136a5146d45660d3d97f5671352a47a0601.tar.gz
Add emails around invitation.
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/groups.rb21
-rw-r--r--app/mailers/emails/projects.rb25
2 files changed, 42 insertions, 4 deletions
diff --git a/app/mailers/emails/groups.rb b/app/mailers/emails/groups.rb
index 626eb593d51..9db609006e0 100644
--- a/app/mailers/emails/groups.rb
+++ b/app/mailers/emails/groups.rb
@@ -5,8 +5,27 @@ module Emails
@group = @group_member.group
@target_url = group_url(@group)
@current_user = @group_member.user
- mail(to: @group_member.user.email,
+ mail(to: @group_member.user.notification_email,
subject: subject("Access to group was granted"))
end
+
+ def group_member_invited_email(group_member_id, token)
+ @group_member = GroupMember.find group_member_id
+ @group = @group_member.group
+ @token = token
+ @target_url = group_url(@group)
+ mail(to: @group_member.invite_email,
+ subject: "Invite to join group #{@group.name}")
+ end
+
+ def group_invite_accepted_email(group_member_id)
+ @group_member = GroupMember.find group_member_id
+ return if @group_member.created_by.nil?
+
+ @group = @group_member.group
+ @target_url = group_url(@group)
+ mail(to: @group_member.created_by.notification_email,
+ subject: subject("Invite accepted"))
+ end
end
end
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 20a863c3742..64c35618a52 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -1,14 +1,33 @@
module Emails
module Projects
- def project_access_granted_email(user_project_id)
- @project_member = ProjectMember.find user_project_id
+ 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.email,
+ mail(to: @project_member.user.notification_email,
subject: subject("Access to project was granted"))
end
+ def project_member_invited_email(project_member_id, token)
+ @project_member = ProjectMember.find project_member_id
+ @project = @project_member.project
+ @token = token
+ @target_url = namespace_project_url(@project.namespace, @project)
+ mail(to: @project_member.invite_email,
+ subject: "Invite to join project #{@project.name_with_namespace}")
+ end
+
+ def project_invite_accepted_email(project_member_id)
+ @project_member = ProjectMember.find project_member_id
+ return if @project_member.created_by.nil?
+
+ @project = @project_member.project
+ @target_url = namespace_project_url(@project.namespace, @project)
+ mail(to: @project_member.created_by.notification_email,
+ subject: subject("Invite accepted"))
+ end
+
def project_was_moved_email(project_id, user_id)
@current_user = @user = User.find user_id
@project = Project.find project_id