Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
30815dc8
Commit
30815dc8
authored
Oct 15, 2020
by
Arturo Herrero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Feature flag group_level_integrations default enabled"
This reverts commit
2bf164f5
.
parent
bf2a91f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
10 deletions
+5
-10
app/controllers/groups/settings/integrations_controller.rb
app/controllers/groups/settings/integrations_controller.rb
+1
-1
app/helpers/services_helper.rb
app/helpers/services_helper.rb
+1
-1
app/services/admin/propagate_integration_service.rb
app/services/admin/propagate_integration_service.rb
+1
-1
app/services/groups/create_service.rb
app/services/groups/create_service.rb
+1
-1
changelogs/unreleased/group-level-integration-feature-flag-default-enable.yml
...d/group-level-integration-feature-flag-default-enable.yml
+0
-5
config/feature_flags/development/group_level_integrations.yml
...ig/feature_flags/development/group_level_integrations.yml
+1
-1
No files found.
app/controllers/groups/settings/integrations_controller.rb
View file @
30815dc8
...
...
@@ -26,7 +26,7 @@ module Groups
end
def
integrations_enabled?
Feature
.
enabled?
(
:group_level_integrations
,
group
,
default_enabled:
true
)
Feature
.
enabled?
(
:group_level_integrations
,
group
)
end
def
scoped_edit_integration_path
(
integration
)
...
...
app/helpers/services_helper.rb
View file @
30815dc8
...
...
@@ -121,7 +121,7 @@ module ServicesHelper
end
def
group_level_integrations?
@group
.
present?
&&
Feature
.
enabled?
(
:group_level_integrations
,
@group
,
default_enabled:
true
)
@group
.
present?
&&
Feature
.
enabled?
(
:group_level_integrations
,
@group
)
end
def
instance_level_integrations?
...
...
app/services/admin/propagate_integration_service.rb
View file @
30815dc8
...
...
@@ -8,7 +8,7 @@ module Admin
update_inherited_integrations
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
else
create_integration_for_groups_without_integration_belonging_to_group
...
...
app/services/groups/create_service.rb
View file @
30815dc8
...
...
@@ -34,7 +34,7 @@ module Groups
if
@group
.
save
@group
.
add_owner
(
current_user
)
@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
...
...
changelogs/unreleased/group-level-integration-feature-flag-default-enable.yml
deleted
100644 → 0
View file @
bf2a91f6
---
title
:
Add group-level integration management for external services.
merge_request
:
44995
author
:
type
:
added
config/feature_flags/development/group_level_integrations.yml
View file @
30815dc8
...
...
@@ -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
group
:
group::ecosystem
type
:
development
default_enabled
:
tru
e
default_enabled
:
fals
e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment