Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 7 insertions, 11 deletions

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 6aa6afb595d..733b7c4bc87 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -109,28 +109,24 @@ class ProjectMember < Member
     end
   end
 
+  # This method is overridden in the test environment, see stubbed_member.rb
   override :refresh_member_authorized_projects
-  def refresh_member_authorized_projects(blocking:)
+  def refresh_member_authorized_projects
     return unless user
 
-    # rubocop:disable CodeReuse/ServiceClass
-    if blocking
-      blocking_project_authorizations_refresh
-    else
-      AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker.perform_async(project.id, user.id)
-    end
+    execute_project_authorizations_refresh
 
+    # rubocop:disable CodeReuse/ServiceClass
     # Until we compare the inconsistency rates of the new, specialized service and
     # the old approach, we still run AuthorizedProjectsWorker
     # but with some delay and lower urgency as a safety net.
     UserProjectAccessChangedService.new(user_id)
-                                   .execute(blocking: false, priority: UserProjectAccessChangedService::LOW_PRIORITY)
+                                   .execute(priority: UserProjectAccessChangedService::LOW_PRIORITY)
     # rubocop:enable CodeReuse/ServiceClass
   end
 
-  # This method is overridden in the test environment, see stubbed_member.rb
-  def blocking_project_authorizations_refresh
-    AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker.bulk_perform_and_wait([[project.id, user.id]])
+  def execute_project_authorizations_refresh
+    AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker.perform_async(project.id, user.id)
   end
 
   # TODO: https://gitlab.com/groups/gitlab-org/-/epics/7054