diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-09 14:35:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-09 14:35:54 +0000 |
| commit | 2c894856c2363cb84cbafab14439c05f80bdd115 (patch) | |
| tree | 0844ee908836f8f024374c623768a8c47454d264 | |
| parent | 39f9f0bdbb4cabcab14202270484b7c459483420 (diff) | |
| parent | dc6b8adba96bd3bb1b8ebf561aaf261f1cb209a1 (diff) | |
| download | gitlab-ce-2c894856c2363cb84cbafab14439c05f80bdd115.tar.gz | |
Merge branch 'app-differences' into 'master'
Backport EE changes to Members::BaseService
See merge request gitlab-org/gitlab-ce!31581
| -rw-r--r-- | app/services/members/base_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/members/base_service.rb b/app/services/members/base_service.rb index e78affff797..5d69418fb7d 100644 --- a/app/services/members/base_service.rb +++ b/app/services/members/base_service.rb @@ -51,7 +51,9 @@ module Members def enqueue_delete_todos(member) type = member.is_a?(GroupMember) ? 'Group' : 'Project' # don't enqueue immediately to prevent todos removal in case of a mistake - TodosDestroyer::EntityLeaveWorker.perform_in(Todo::WAIT_FOR_DELETE, member.user_id, member.source_id, type) + member.run_after_commit_or_now do + TodosDestroyer::EntityLeaveWorker.perform_in(Todo::WAIT_FOR_DELETE, member.user_id, member.source_id, type) + end end end end |