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
499a27c8
Commit
499a27c8
authored
Oct 25, 2021
by
Baodong
Committed by
Luke Duncalfe
Oct 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn on Feature Flag of ZenTao
Turn on the Feature Flag of Integration of ZenTao. Changelog: changed
parent
210552b2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
20 deletions
+3
-20
app/models/integrations/zentao.rb
app/models/integrations/zentao.rb
+0
-4
app/models/project.rb
app/models/project.rb
+1
-4
config/feature_flags/development/zentao_issues_integration.yml
...g/feature_flags/development/zentao_issues_integration.yml
+0
-8
ee/app/controllers/projects/integrations/zentao/issues_controller.rb
...rollers/projects/integrations/zentao/issues_controller.rb
+1
-3
lib/sidebars/projects/panel.rb
lib/sidebars/projects/panel.rb
+1
-1
No files found.
app/models/integrations/zentao.rb
View file @
499a27c8
...
...
@@ -9,10 +9,6 @@ module Integrations
validates
:api_token
,
presence:
true
,
if: :activated?
validates
:zentao_product_xid
,
presence:
true
,
if: :activated?
def
self
.
feature_flag_enabled?
(
project
)
Feature
.
enabled?
(
:zentao_issues_integration
,
project
)
end
# License Level: EEP_FEATURES
def
self
.
issues_license_available?
(
project
)
project
&
.
licensed_feature_available?
(
:zentao_issues_integration
)
...
...
app/models/project.rb
View file @
499a27c8
...
...
@@ -1453,10 +1453,7 @@ class Project < ApplicationRecord
end
def
disabled_integrations
disabled_integrations
=
[]
disabled_integrations
<<
:zentao
unless
::
Integrations
::
Zentao
.
feature_flag_enabled?
(
self
)
disabled_integrations
[]
end
def
find_or_initialize_integration
(
name
)
...
...
config/feature_flags/development/zentao_issues_integration.yml
deleted
100644 → 0
View file @
210552b2
---
name
:
zentao_issues_integration
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69602
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/338775
milestone
:
'
14.4'
type
:
development
group
:
group::integrations
default_enabled
:
false
ee/app/controllers/projects/integrations/zentao/issues_controller.rb
View file @
499a27c8
...
...
@@ -34,7 +34,7 @@ module Projects
private
def
query_params
params
.
permit
(
:id
,
:page
,
:limit
,
:search
,
:sort
,
:state
,
:labels
)
params
.
permit
(
:id
,
:page
,
:limit
,
:search
,
:sort
,
:state
,
labels:
[]
)
end
def
query
...
...
@@ -53,8 +53,6 @@ module Projects
end
def
check_feature_enabled!
return
render_404
unless
::
Integrations
::
Zentao
.
feature_flag_enabled?
(
project
)
return
render_404
unless
::
Integrations
::
Zentao
.
issues_license_available?
(
project
)
&&
project
.
zentao_integration
&
.
active?
end
...
...
lib/sidebars/projects/panel.rb
View file @
499a27c8
...
...
@@ -23,7 +23,7 @@ module Sidebars
add_menu
(
Sidebars
::
Projects
::
Menus
::
RepositoryMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
IssuesMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
ExternalIssueTrackerMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
ZentaoMenu
.
new
(
context
))
if
::
Integrations
::
Zentao
.
feature_flag_enabled?
(
context
.
project
)
add_menu
(
Sidebars
::
Projects
::
Menus
::
ZentaoMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
MergeRequestsMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
CiCdMenu
.
new
(
context
))
add_menu
(
Sidebars
::
Projects
::
Menus
::
SecurityComplianceMenu
.
new
(
context
))
...
...
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