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
be9ddf35
Commit
be9ddf35
authored
Jul 23, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature flag definition and controller check
parent
9a6b9499
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
app/controllers/admin/integrations_controller.rb
app/controllers/admin/integrations_controller.rb
+5
-0
config/feature_flags/development/instance_level_integration_overrides.yml
...lags/development/instance_level_integration_overrides.yml
+8
-0
No files found.
app/controllers/admin/integrations_controller.rb
View file @
be9ddf35
...
@@ -5,6 +5,7 @@ class Admin::IntegrationsController < Admin::ApplicationController
...
@@ -5,6 +5,7 @@ class Admin::IntegrationsController < Admin::ApplicationController
include
IntegrationsHelper
include
IntegrationsHelper
before_action
:not_found
,
unless:
->
{
instance_level_integrations?
}
before_action
:not_found
,
unless:
->
{
instance_level_integrations?
}
before_action
:not_found
,
unless:
->
{
instance_level_integration_overrides?
},
only: :overrides
feature_category
:integrations
feature_category
:integrations
...
@@ -25,4 +26,8 @@ class Admin::IntegrationsController < Admin::ApplicationController
...
@@ -25,4 +26,8 @@ class Admin::IntegrationsController < Admin::ApplicationController
def
find_or_initialize_non_project_specific_integration
(
name
)
def
find_or_initialize_non_project_specific_integration
(
name
)
Integration
.
find_or_initialize_non_project_specific_integration
(
name
,
instance:
true
)
Integration
.
find_or_initialize_non_project_specific_integration
(
name
,
instance:
true
)
end
end
def
instance_level_integration_overrides?
Feature
.
enabled?
(
:instance_level_integration_overrides
,
default_enabled: :yaml
)
end
end
end
config/feature_flags/development/instance_level_integration_overrides.yml
0 → 100644
View file @
be9ddf35
---
name
:
instance_level_integration_overrides
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66723
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/336750
milestone
:
'
14.2'
type
:
development
group
:
group::ecosystem
default_enabled
:
false
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