diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-23 16:38:37 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-26 08:28:05 +0200 |
| commit | 8d381b359fd12874a91777cad0a54d58fcb2bf07 (patch) | |
| tree | 046683072dc52a1027d5fbf8d3f103cd17b33ec1 /app | |
| parent | 928e45e7d3ac34d4b98bf0d8d57ca6c33e1e924f (diff) | |
| download | gitlab-ce-8d381b359fd12874a91777cad0a54d58fcb2bf07.tar.gz | |
Ensure member notifications are sent after the member actual creation/update in the DB
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/members/group_member.rb | 6 | ||||
| -rw-r--r-- | app/models/members/project_member.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index 661e668dbf9..5da739f9618 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -37,20 +37,20 @@ class GroupMember < Member private def send_invite - notification_service.invite_group_member(self, @raw_invite_token) + run_after_commit_or_now { notification_service.invite_group_member(self, @raw_invite_token) } super end def post_create_hook - notification_service.new_group_member(self) + run_after_commit_or_now { notification_service.new_group_member(self) } super end def post_update_hook if access_level_changed? - notification_service.update_group_member(self) + run_after_commit { notification_service.update_group_member(self) } end super diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 1c7ed4a96df..024106056b4 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -92,7 +92,7 @@ class ProjectMember < Member private def send_invite - notification_service.invite_project_member(self, @raw_invite_token) + run_after_commit_or_now { notification_service.invite_project_member(self, @raw_invite_token) } super end @@ -100,7 +100,7 @@ class ProjectMember < Member def post_create_hook unless owner? event_service.join_project(self.project, self.user) - notification_service.new_project_member(self) + run_after_commit_or_now { notification_service.new_project_member(self) } end super @@ -108,7 +108,7 @@ class ProjectMember < Member def post_update_hook if access_level_changed? - notification_service.update_project_member(self) + run_after_commit { notification_service.update_project_member(self) } end super |