summaryrefslogtreecommitdiff
path: root/app/models/members
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/models/members
parent39f389ae0fff5706b73b03c8fb5fc4e3dd7da638 (diff)
downloadgitlab-ce-717fa136a5146d45660d3d97f5671352a47a0601.tar.gz
Add emails around invitation.
Diffstat (limited to 'app/models/members')
-rw-r--r--app/models/members/group_member.rb12
-rw-r--r--app/models/members/project_member.rb12
2 files changed, 24 insertions, 0 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index ccbbab6afc5..68b7c169f72 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -41,6 +41,12 @@ class GroupMember < Member
private
+ def send_invite
+ notification_service.invite_group_member(self, @raw_invite_token)
+
+ super
+ end
+
def post_create_hook
notification_service.new_group_member(self)
@@ -54,4 +60,10 @@ class GroupMember < Member
super
end
+
+ def after_accept_invite
+ notification_service.accept_group_invite(self)
+
+ super
+ end
end
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 6c5d161940d..a63d5af1219 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -116,6 +116,12 @@ class ProjectMember < Member
private
+ def send_invite
+ notification_service.invite_project_member(self, @raw_invite_token)
+
+ super
+ end
+
def post_create_hook
unless owner?
event_service.join_project(self.project, self.user)
@@ -139,6 +145,12 @@ class ProjectMember < Member
super
end
+ def after_accept_invite
+ notification_service.accept_project_invite(self)
+
+ super
+ end
+
def event_service
EventCreateService.new
end