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>2020-12-10 09:09:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 09:09:47 +0300
commit65952e598a194110f5894da1c42577b2b20c6336 (patch)
tree224311d216425668c8b653b82fe009f3d965e8b4 /app/services/admin
parenta8b811acdfb8200f30cdd70d290e87bb7ac46ab1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/admin')
-rw-r--r--app/services/admin/propagate_integration_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/admin/propagate_integration_service.rb b/app/services/admin/propagate_integration_service.rb
index ddd5add42bd..253c3a84fef 100644
--- a/app/services/admin/propagate_integration_service.rb
+++ b/app/services/admin/propagate_integration_service.rb
@@ -7,7 +7,7 @@ module Admin
def propagate
if integration.instance?
update_inherited_integrations
- create_integration_for_groups_without_integration if Feature.enabled?(:group_level_integrations, default_enabled: true)
+ create_integration_for_groups_without_integration
create_integration_for_projects_without_integration
else
update_inherited_descendant_integrations