From 499a27c8587abe2dc8f6ea0f1e5f673641a138db Mon Sep 17 00:00:00 2001 From: Baodong Date: Mon, 25 Oct 2021 14:59:34 +0800 Subject: [PATCH] Turn on Feature Flag of ZenTao Turn on the Feature Flag of Integration of ZenTao. Changelog: changed --- app/models/integrations/zentao.rb | 4 ---- app/models/project.rb | 5 +---- .../development/zentao_issues_integration.yml | 8 -------- .../projects/integrations/zentao/issues_controller.rb | 4 +--- lib/sidebars/projects/panel.rb | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 config/feature_flags/development/zentao_issues_integration.yml diff --git a/app/models/integrations/zentao.rb b/app/models/integrations/zentao.rb index ab6242a649b036..3d6d4627d24763 100644 --- a/app/models/integrations/zentao.rb +++ b/app/models/integrations/zentao.rb @@ -9,10 +9,6 @@ class Zentao < Integration 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) diff --git a/app/models/project.rb b/app/models/project.rb index 031dbc3e9bbe10..f2c26f918069ee 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1453,10 +1453,7 @@ def find_or_initialize_integrations 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) diff --git a/config/feature_flags/development/zentao_issues_integration.yml b/config/feature_flags/development/zentao_issues_integration.yml deleted file mode 100644 index 150340874cb54a..00000000000000 --- a/config/feature_flags/development/zentao_issues_integration.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 diff --git a/ee/app/controllers/projects/integrations/zentao/issues_controller.rb b/ee/app/controllers/projects/integrations/zentao/issues_controller.rb index 0d40c46f793d97..c751652f7f50bb 100644 --- a/ee/app/controllers/projects/integrations/zentao/issues_controller.rb +++ b/ee/app/controllers/projects/integrations/zentao/issues_controller.rb @@ -34,7 +34,7 @@ def show 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 @@ def issues_json 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 diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb index f37f404d03cd13..374662162b5c85 100644 --- a/lib/sidebars/projects/panel.rb +++ b/lib/sidebars/projects/panel.rb @@ -23,7 +23,7 @@ def add_menus 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)) -- GitLab