summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 18:10:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 18:10:10 +0000
commitea4766228b5536c83f1917d6058be913472ffa2d (patch)
tree5ebf5ea0f996be6c6908e6b631b72c33bc13e997 /app/workers
parent4b64dc27ae5bac20dec888431c236fef2bfdc449 (diff)
downloadgitlab-ce-ea4766228b5536c83f1917d6058be913472ffa2d.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/authorized_project_update/project_group_link_create_worker.rb7
-rw-r--r--app/workers/authorized_projects_worker.rb3
2 files changed, 7 insertions, 3 deletions
diff --git a/app/workers/authorized_project_update/project_group_link_create_worker.rb b/app/workers/authorized_project_update/project_group_link_create_worker.rb
index 5fb59efaacb..dd24a9602bb 100644
--- a/app/workers/authorized_project_update/project_group_link_create_worker.rb
+++ b/app/workers/authorized_project_update/project_group_link_create_worker.rb
@@ -10,12 +10,13 @@ module AuthorizedProjectUpdate
idempotent!
- def perform(project_id, group_id)
+ def perform(project_id, group_id, group_access = nil)
project = Project.find(project_id)
group = Group.find(group_id)
- AuthorizedProjectUpdate::ProjectGroupLinkCreateService.new(project, group)
- .execute
+ AuthorizedProjectUpdate::ProjectGroupLinkCreateService
+ .new(project, group, group_access)
+ .execute
end
end
end
diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb
index 62eea8e0462..f5132459131 100644
--- a/app/workers/authorized_projects_worker.rb
+++ b/app/workers/authorized_projects_worker.rb
@@ -16,6 +16,9 @@ class AuthorizedProjectsWorker
if Rails.env.test?
def self.bulk_perform_and_wait(args_list, timeout: 10)
end
+
+ def self.bulk_perform_inline(args_list)
+ end
end
# rubocop: disable CodeReuse/ActiveRecord