diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 18:07:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 18:07:43 +0300 |
commit | f8a5275c45ed2276daf843764113476749e680d2 (patch) | |
tree | 4856524dbeebf0280a87ff71bcc274f496975e72 /app/workers | |
parent | e6fed37d941271b897d37820fd3b571feab280b0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
5 files changed, 40 insertions, 4 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 1149f64314e..50b301b2fc3 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -1272,6 +1272,15 @@ :weight: 1 :idempotent: false :tags: [] +- :name: github_importer:github_import_pull_requests_import_merged_by + :worker_name: Gitlab::GithubImport::PullRequests::ImportMergedByWorker + :feature_category: :importers + :has_external_dependencies: true + :urgency: :low + :resource_boundary: :cpu + :weight: 1 + :idempotent: false + :tags: [] - :name: github_importer:github_import_pull_requests_import_review :worker_name: Gitlab::GithubImport::PullRequests::ImportReviewWorker :feature_category: :importers diff --git a/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb b/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb index ab0cb81249b..94472fdf6db 100644 --- a/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb +++ b/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +# TODO: remove in 16.1 milestone +# https://gitlab.com/gitlab-org/gitlab/-/issues/409706 module Gitlab module GithubImport class ImportPullRequestMergedByWorker # rubocop:disable Scalability/IdempotentWorker @@ -12,7 +14,7 @@ module Gitlab end def importer_class - Importer::PullRequestMergedByImporter + Importer::PullRequests::MergedByImporter end def object_type diff --git a/app/workers/gitlab/github_import/import_release_attachments_worker.rb b/app/workers/gitlab/github_import/import_release_attachments_worker.rb index bf901f2f7b8..0d3831789bf 100644 --- a/app/workers/gitlab/github_import/import_release_attachments_worker.rb +++ b/app/workers/gitlab/github_import/import_release_attachments_worker.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -# TODO: remove in 16.X milestone -# https://gitlab.com/gitlab-org/gitlab/-/issues/377059 +# TODO: remove in 16.1 milestone +# https://gitlab.com/gitlab-org/gitlab/-/issues/409706 module Gitlab module GithubImport class ImportReleaseAttachmentsWorker # rubocop:disable Scalability/IdempotentWorker diff --git a/app/workers/gitlab/github_import/pull_requests/import_merged_by_worker.rb b/app/workers/gitlab/github_import/pull_requests/import_merged_by_worker.rb new file mode 100644 index 00000000000..2c9b2cdffac --- /dev/null +++ b/app/workers/gitlab/github_import/pull_requests/import_merged_by_worker.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module Gitlab + module GithubImport + module PullRequests + class ImportMergedByWorker # rubocop:disable Scalability/IdempotentWorker + include ObjectImporter + + worker_resource_boundary :cpu + + def representation_class + Gitlab::GithubImport::Representation::PullRequest + end + + def importer_class + Importer::PullRequests::MergedByImporter + end + + def object_type + :pull_request_merged_by + end + end + end + end +end diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb index 9b123b5776a..329bf8f84b1 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb @@ -15,7 +15,7 @@ module Gitlab # client - An instance of Gitlab::GithubImport::Client. # project - An instance of Project. def import(client, project) - waiter = Importer::PullRequestsMergedByImporter + waiter = Importer::PullRequests::AllMergedByImporter .new(project, client) .execute |