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/services/admin
parent133ec9237af290062aae70e6f115db69b51c88de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/admin')
-rw-r--r--app/services/admin/propagate_integration_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/admin/propagate_integration_service.rb b/app/services/admin/propagate_integration_service.rb
index 2ce1756ef1a..f7a4bf1a9f9 100644
--- a/app/services/admin/propagate_integration_service.rb
+++ b/app/services/admin/propagate_integration_service.rb
@@ -20,14 +20,14 @@ module Admin
def update_inherited_integrations
propagate_integrations(
- Service.by_type(integration.type).inherit_from_id(integration.id),
+ Integration.by_type(integration.type).inherit_from_id(integration.id),
PropagateIntegrationInheritWorker
)
end
def update_inherited_descendant_integrations
propagate_integrations(
- Service.inherited_descendants_from_self_or_ancestors_from(integration),
+ Integration.inherited_descendants_from_self_or_ancestors_from(integration),
PropagateIntegrationInheritDescendantWorker
)
end