Commit 536ded0c authored by Arturo Herrero's avatar Arturo Herrero

Feature flag group_level_integrations default enabled

This reverts commit 30815dc8.
parent 58735e25
...@@ -26,7 +26,7 @@ module Groups ...@@ -26,7 +26,7 @@ module Groups
end end
def integrations_enabled? def integrations_enabled?
Feature.enabled?(:group_level_integrations, group) Feature.enabled?(:group_level_integrations, group, default_enabled: true)
end end
def scoped_edit_integration_path(integration) def scoped_edit_integration_path(integration)
......
...@@ -114,7 +114,7 @@ module ServicesHelper ...@@ -114,7 +114,7 @@ module ServicesHelper
end end
def group_level_integrations? def group_level_integrations?
@group.present? && Feature.enabled?(:group_level_integrations, @group) @group.present? && Feature.enabled?(:group_level_integrations, @group, default_enabled: true)
end end
def instance_level_integrations? def instance_level_integrations?
......
...@@ -7,7 +7,7 @@ module Admin ...@@ -7,7 +7,7 @@ module Admin
def propagate def propagate
if integration.instance? if integration.instance?
update_inherited_integrations update_inherited_integrations
create_integration_for_groups_without_integration if Feature.enabled?(:group_level_integrations) create_integration_for_groups_without_integration if Feature.enabled?(:group_level_integrations, default_enabled: true)
create_integration_for_projects_without_integration create_integration_for_projects_without_integration
else else
update_inherited_descendant_integrations update_inherited_descendant_integrations
......
...@@ -34,7 +34,7 @@ module Groups ...@@ -34,7 +34,7 @@ module Groups
if @group.save if @group.save
@group.add_owner(current_user) @group.add_owner(current_user)
@group.create_namespace_settings @group.create_namespace_settings
Service.create_from_active_default_integrations(@group, :group_id) if Feature.enabled?(:group_level_integrations) Service.create_from_active_default_integrations(@group, :group_id) if Feature.enabled?(:group_level_integrations, default_enabled: true)
end end
end end
......
---
title: Add group-level integration management for external services.
merge_request: 47391
author:
type: added
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575
milestone: '12.10' milestone: '12.10'
type: development type: development
group: group::ecosystem group: group::ecosystem
default_enabled: false default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment