diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 22:51:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 22:51:41 +0300 |
commit | e7b32a77cc40a14eb0dd6ae1bfc6f036819c66cc (patch) | |
tree | 86f33d8f98e4eab9c8a8e900f9e370939921c378 /config | |
parent | 4711b9334036cc4719fb9e475545709e8fd5b649 (diff) |
Add latest changes from gitlab-org/gitlab@16-0-stable-ee
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_flags/development/bitbucket_server_parallel_importer.yml | 8 | ||||
-rw-r--r-- | config/sidekiq_queues.yml | 18 |
2 files changed, 26 insertions, 0 deletions
diff --git a/config/feature_flags/development/bitbucket_server_parallel_importer.yml b/config/feature_flags/development/bitbucket_server_parallel_importer.yml new file mode 100644 index 00000000000..be553a5e6da --- /dev/null +++ b/config/feature_flags/development/bitbucket_server_parallel_importer.yml @@ -0,0 +1,8 @@ +--- +name: bitbucket_server_parallel_importer +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120931 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411796 +milestone: '16.1' +type: development +group: group::import and integrate +default_enabled: true diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 370fe87ff96..b2c9785b3e5 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -77,6 +77,24 @@ - 1 - - batched_background_migrations - 1 +- - bitbucket_server_import_advance_stage + - 1 +- - bitbucket_server_import_import_lfs_object + - 1 +- - bitbucket_server_import_import_pull_request + - 1 +- - bitbucket_server_import_import_pull_request_notes + - 1 +- - bitbucket_server_import_stage_finish_import + - 1 +- - bitbucket_server_import_stage_import_lfs_objects + - 1 +- - bitbucket_server_import_stage_import_notes + - 1 +- - bitbucket_server_import_stage_import_pull_requests + - 1 +- - bitbucket_server_import_stage_import_repository + - 1 - - bulk_import - 1 - - bulk_imports_entity |