diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
| commit | e74c6ae6b60900c7f0b6a34c843fa2630a4685bc (patch) | |
| tree | a65191948ae860397df698dfbc85ba91c96f4e85 /app/services | |
| parent | 844bf10847af67d2561ef137fcfbe6ba61204e6c (diff) | |
| parent | 88e627cf14b47ca5d63f2cb0ffe24124fb4b116a (diff) | |
| download | gitlab-ce-e74c6ae6b60900c7f0b6a34c843fa2630a4685bc.tar.gz | |
Merge branch 'refresh-authorizations-fork-join' into 'master'
Fix race conditions for AuthorizedProjectsWorker
Closes #26194 and #26310
See merge request !8701
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/user_project_access_changed_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/user_project_access_changed_service.rb b/app/services/user_project_access_changed_service.rb index 2469b4f0d7c..d7a6804ee88 100644 --- a/app/services/user_project_access_changed_service.rb +++ b/app/services/user_project_access_changed_service.rb @@ -4,6 +4,6 @@ class UserProjectAccessChangedService end def execute - AuthorizedProjectsWorker.bulk_perform_async(@user_ids.map { |id| [id] }) + AuthorizedProjectsWorker.bulk_perform_and_wait(@user_ids.map { |id| [id] }) end end |