Commit d456f36a authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'revert-group-level-integrations-feature-flag-default-enabled' into 'master'

Revert "Feature flag group_level_integrations default enabled"

See merge request gitlab-org/gitlab!45329
parents e292fba2 30815dc8
...@@ -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, default_enabled: true) Feature.enabled?(:group_level_integrations, group)
end end
def scoped_edit_integration_path(integration) def scoped_edit_integration_path(integration)
......
...@@ -121,7 +121,7 @@ module ServicesHelper ...@@ -121,7 +121,7 @@ module ServicesHelper
end end
def group_level_integrations? def group_level_integrations?
@group.present? && Feature.enabled?(:group_level_integrations, @group, default_enabled: true) @group.present? && Feature.enabled?(:group_level_integrations, @group)
end end
def instance_level_integrations? def instance_level_integrations?
......
...@@ -8,7 +8,7 @@ module Admin ...@@ -8,7 +8,7 @@ module Admin
update_inherited_integrations update_inherited_integrations
if integration.instance? if integration.instance?
create_integration_for_groups_without_integration if Feature.enabled?(:group_level_integrations, default_enabled: true) create_integration_for_groups_without_integration if Feature.enabled?(:group_level_integrations)
create_integration_for_projects_without_integration create_integration_for_projects_without_integration
else else
create_integration_for_groups_without_integration_belonging_to_group create_integration_for_groups_without_integration_belonging_to_group
......
...@@ -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, default_enabled: true) Service.create_from_active_default_integrations(@group, :group_id) if Feature.enabled?(:group_level_integrations)
end end
end end
......
---
title: Add group-level integration management for external services.
merge_request: 44995
author:
type: added
...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27557 ...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27557
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575
group: group::ecosystem group: group::ecosystem
type: development type: development
default_enabled: true default_enabled: false
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