Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-18 19:53:32 +0300
committerRémy Coutable <remy@rymai.me>2016-06-14 14:07:26 +0300
commitd26f81239a33b80694783ee35f0da0e2ed082c9b (patch)
treef092e818d4b81805a16879b13407a335bbda0054 /app/services/notification_service.rb
parent17c22156c5fa5663aae65178ed38cbeef9a80b7e (diff)
Add request access for groups
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/notification_service.rb')
-rw-r--r--app/services/notification_service.rb22
1 files changed, 14 insertions, 8 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index e7676861e9b..cd11feb9d7a 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -173,16 +173,13 @@ class NotificationService
end
end
- def request_access_project_member(project_member)
- mailer.project_member_requested_access(project_member.id).deliver_later
+ # Project access request
+ def new_project_access_request(project_member)
+ mailer.project_access_requested_email(project_member.id).deliver_later
end
- def accept_project_request_access(project_member)
- mailer.project_request_access_accepted_email(project_member.id).deliver_later
- end
-
- def decline_project_request_access(project_member)
- mailer.project_request_access_declined_email(project_member.id).deliver_later
+ def decline_project_access_request(project, user)
+ mailer.project_access_denied_email(project.id, user.id).deliver_later
end
def invite_project_member(project_member, token)
@@ -210,6 +207,15 @@ class NotificationService
mailer.project_access_granted_email(project_member.id).deliver_later
end
+ # Group access request
+ def new_group_access_request(group_member)
+ mailer.group_access_requested_email(group_member.id).deliver_later
+ end
+
+ def decline_group_access_request(group, user)
+ mailer.group_access_denied_email(group.id, user.id).deliver_later
+ end
+
def invite_group_member(group_member, token)
mailer.group_member_invited_email(group_member.id, token).deliver_later
end