summaryrefslogtreecommitdiff
path: root/app/models/members
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-08-04 13:56:33 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2017-08-11 16:02:04 -0700
commit90dd3fb32c1205ddd31c1c2c89b297e9528e0da8 (patch)
treefa321923853430bce44f3ca5a00861771db6645f /app/models/members
parent0268fc2ffc7cdc12a6e1a0bf565fe70ff8541398 (diff)
downloadgitlab-ce-90dd3fb32c1205ddd31c1c2c89b297e9528e0da8.tar.gz
a membership with no user is always notifiable
since this is for user invites and the like.
Diffstat (limited to 'app/models/members')
-rw-r--r--app/models/members/group_member.rb4
-rw-r--r--app/models/members/project_member.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index cf434ec070b..661e668dbf9 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -30,8 +30,8 @@ class GroupMember < Member
'Group'
end
- def notifiable?(type, opts={})
- NotificationRecipientService.notifiable?(user, type, { group: group }.merge(opts))
+ def notifiable_options
+ { group: group }
end
private
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 47e47caad82..b6f1dd272cd 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -87,8 +87,8 @@ class ProjectMember < Member
project.owner == user
end
- def notifiable?(type, opts={})
- NotificationRecipientService.notifiable?(user, type, { project: project }.merge(opts))
+ def notifiable_options
+ { project: project }
end
private