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:
Diffstat (limited to 'app/services/notification_service.rb')
-rw-r--r--app/services/notification_service.rb40
1 files changed, 16 insertions, 24 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 47bc36fce70..b93b44ce797 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -492,6 +492,18 @@ class NotificationService
mailer.member_access_denied_email(member.real_source_type, member.source_id, member.user_id).deliver_later
end
+ def decline_invite(member)
+ # Must always send, regardless of project/namespace configuration since it's a
+ # response to the user's action.
+
+ mailer.member_invite_declined_email(
+ member.real_source_type,
+ member.source.id,
+ member.invite_email,
+ member.created_by_id
+ ).deliver_later
+ end
+
# Project invite
def invite_project_member(project_member, token)
return true unless project_member.notifiable?(:subscription)
@@ -505,18 +517,6 @@ class NotificationService
mailer.member_invite_accepted_email(project_member.real_source_type, project_member.id).deliver_later
end
- def decline_project_invite(project_member)
- # Must always send, regardless of project/namespace configuration since it's a
- # response to the user's action.
-
- mailer.member_invite_declined_email(
- project_member.real_source_type,
- project_member.project.id,
- project_member.invite_email,
- project_member.created_by_id
- ).deliver_later
- end
-
def new_project_member(project_member)
return true unless project_member.notifiable?(:mention, skip_read_ability: true)
@@ -542,18 +542,6 @@ class NotificationService
mailer.member_invite_accepted_email(group_member.real_source_type, group_member.id).deliver_later
end
- def decline_group_invite(group_member)
- # Must always send, regardless of project/namespace configuration since it's a
- # response to the user's action.
-
- mailer.member_invite_declined_email(
- group_member.real_source_type,
- group_member.group.id,
- group_member.invite_email,
- group_member.created_by_id
- ).deliver_later
- end
-
def new_group_member(group_member)
return true unless group_member.notifiable?(:mention)
@@ -810,6 +798,10 @@ class NotificationService
end
end
+ def new_achievement_email(user, achievement)
+ mailer.new_achievement_email(user, achievement)
+ end
+
protected
def new_resource_email(target, current_user, method)