summaryrefslogtreecommitdiff
path: root/app/services/user_project_access_changed_service.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-08-23 15:28:16 +0100
committerNick Thomas <nick@gitlab.com>2017-08-25 16:19:32 +0100
commit8b73df0cf534797bff9ce0f5b95af5347ea59ca6 (patch)
tree9dea336cc8619391dbdf6c904a3f72e873c37090 /app/services/user_project_access_changed_service.rb
parent24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff)
downloadgitlab-ce-8b73df0cf534797bff9ce0f5b95af5347ea59ca6.tar.gz
Move sidekiq-based project authorization refresh out of Projects::CreateService
If the project is in a group, the `group.refresh_members_authorized_projects` is made non-blocking, and we call `current_user.refresh_authorized_projects` directly. Projects in a personal namespace are more difficult. Rather than passing the `blocking:` parameter through the entire `add_master` chain, have the `AuthorizedProjectsWorker` automatically inline authorizations for three IDs or less. Since the maximum number of IDs in this path is 2, that has the same effect.
Diffstat (limited to 'app/services/user_project_access_changed_service.rb')
-rw-r--r--app/services/user_project_access_changed_service.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/services/user_project_access_changed_service.rb b/app/services/user_project_access_changed_service.rb
index d7a6804ee88..8630e572624 100644
--- a/app/services/user_project_access_changed_service.rb
+++ b/app/services/user_project_access_changed_service.rb
@@ -3,7 +3,13 @@ class UserProjectAccessChangedService
@user_ids = Array.wrap(user_ids)
end
- def execute
- AuthorizedProjectsWorker.bulk_perform_and_wait(@user_ids.map { |id| [id] })
+ def execute(blocking: true)
+ bulk_args = @user_ids.map { |id| [id] }
+
+ if blocking
+ AuthorizedProjectsWorker.bulk_perform_and_wait(bulk_args)
+ else
+ AuthorizedProjectsWorker.bulk_perform_async(bulk_args)
+ end
end
end