summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-01 09:08:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-01 09:08:57 +0000
commit6324679027fb7f5042b30dbf567764d2f87a7b08 (patch)
treebd6a63b5deee3c9cfc1d45b225085d9ed9f8e6bf
parent1f520d0c7af6a429e7bfb046a8c3ccc6920ef730 (diff)
downloadgitlab-ce-6324679027fb7f5042b30dbf567764d2f87a7b08.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--.rubocop_todo/gitlab/namespaced_class.yml1
-rw-r--r--config/sidekiq_queues.yml2
-rw-r--r--spec/workers/every_sidekiq_worker_spec.rb1
3 files changed, 4 insertions, 0 deletions
diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index ba820abbb3e..b076db1f6c0 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -1138,6 +1138,7 @@ Gitlab/NamespacedClass:
- ee/app/workers/project_template_export_worker.rb
- ee/app/workers/pseudonymizer_worker.rb
- ee/app/workers/refresh_license_compliance_checks_worker.rb
+ - ee/app/workers/repository_push_audit_event_worker.rb
- ee/app/workers/repository_update_mirror_worker.rb
- ee/app/workers/scan_security_report_secrets_worker.rb
- ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 2f44fa966ae..9750c9dd14e 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -401,6 +401,8 @@
- 1
- - repository_import
- 1
+- - repository_push_audit_event
+ - 1
- - repository_remove_remote
- 1
- - repository_update_mirror
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index 4aac236a015..52df224e9d4 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -414,6 +414,7 @@ RSpec.describe 'Every Sidekiq worker' do
'RepositoryImportWorker' => false,
'RepositoryRemoveRemoteWorker' => 3,
'RepositoryUpdateMirrorWorker' => false,
+ 'RepositoryPushAuditEventWorker' => 3,
'RepositoryUpdateRemoteMirrorWorker' => 3,
'RequirementsManagement::ImportRequirementsCsvWorker' => 3,
'RequirementsManagement::ProcessRequirementsReportsWorker' => 3,