diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/workers/propagate_integration_inherit_worker.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/workers/propagate_integration_inherit_worker.rb')
-rw-r--r-- | app/workers/propagate_integration_inherit_worker.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/workers/propagate_integration_inherit_worker.rb b/app/workers/propagate_integration_inherit_worker.rb index 40d67c6d3bf..e7649d6714f 100644 --- a/app/workers/propagate_integration_inherit_worker.rb +++ b/app/workers/propagate_integration_inherit_worker.rb @@ -3,15 +3,18 @@ class PropagateIntegrationInheritWorker include ApplicationWorker + sidekiq_options retry: 3 + feature_category :integrations + tags :exclude_from_kubernetes idempotent! # rubocop: disable CodeReuse/ActiveRecord def perform(integration_id, min_id, max_id) - integration = Service.find_by_id(integration_id) + integration = Integration.find_by_id(integration_id) return unless integration - batch = Service.where(id: min_id..max_id).by_type(integration.type).inherit_from_id(integration.id) + batch = Integration.where(id: min_id..max_id).by_type(integration.type).inherit_from_id(integration.id) BulkUpdateIntegrationService.new(integration, batch).execute end |