Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 15:10:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 15:10:24 +0300
commit71a67d17b02e7b8dec2f4c257f6734dc7818fb1e (patch)
tree6b45633257869a67fd534bd2cf899b93a48794c0 /app/workers/propagate_integration_inherit_worker.rb
parent133ec9237af290062aae70e6f115db69b51c88de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/propagate_integration_inherit_worker.rb')
-rw-r--r--app/workers/propagate_integration_inherit_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/propagate_integration_inherit_worker.rb b/app/workers/propagate_integration_inherit_worker.rb
index 887b703b882..e7649d6714f 100644
--- a/app/workers/propagate_integration_inherit_worker.rb
+++ b/app/workers/propagate_integration_inherit_worker.rb
@@ -11,10 +11,10 @@ class PropagateIntegrationInheritWorker
# 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