1 files changed, 22 insertions, 29 deletions
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 2f6667d3600..e770187b124 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -31,56 +31,49 @@ module Gitlab
         ::Feature.enabled?(:ci_store_pipeline_messages, project, default_enabled: true)
       end
 
-      # Remove in https://gitlab.com/gitlab-org/gitlab/-/issues/227052
-      def self.variables_api_filter_environment_scope?
-        ::Feature.enabled?(:ci_variables_api_filter_environment_scope, default_enabled: true)
-      end
-
       def self.raise_job_rules_without_workflow_rules_warning?
         ::Feature.enabled?(:ci_raise_job_rules_without_workflow_rules_warning, default_enabled: true)
       end
 
-      def self.keep_latest_artifacts_for_ref_enabled?(project)
-        ::Feature.enabled?(:keep_latest_artifacts_for_ref, project, default_enabled: false)
-      end
-
-      def self.destroy_only_unlocked_expired_artifacts_enabled?
-        ::Feature.enabled?(:destroy_only_unlocked_expired_artifacts, default_enabled: false)
-      end
-
       def self.bulk_insert_on_create?(project)
         ::Feature.enabled?(:ci_bulk_insert_on_create, project, default_enabled: true)
       end
 
-      def self.ci_if_parenthesis_enabled?
-        ::Feature.enabled?(:ci_if_parenthesis_enabled, default_enabled: true)
+      # NOTE: The feature flag `disallow_to_create_merge_request_pipelines_in_target_project`
+      # is a safe switch to disable the feature for a parituclar project when something went wrong,
+      # therefore it's not supposed to be enabled by default.
+      def self.disallow_to_create_merge_request_pipelines_in_target_project?(target_project)
+        ::Feature.enabled?(:ci_disallow_to_create_merge_request_pipelines_in_target_project, target_project)
       end
 
-      def self.allow_to_create_merge_request_pipelines_in_target_project?(target_project)
-        ::Feature.enabled?(:ci_allow_to_create_merge_request_pipelines_in_target_project, target_project, default_enabled: true)
+      def self.lint_creates_pipeline_with_dry_run?(project)
+        ::Feature.enabled?(:ci_lint_creates_pipeline_with_dry_run, project, default_enabled: true)
       end
 
-      def self.ci_plan_needs_size_limit?(project)
-        ::Feature.enabled?(:ci_plan_needs_size_limit, project, default_enabled: true)
+      def self.project_transactionless_destroy?(project)
+        Feature.enabled?(:project_transactionless_destroy, project, default_enabled: false)
       end
 
-      def self.job_entry_matches_all_keys?
-        ::Feature.enabled?(:ci_job_entry_matches_all_keys)
+      def self.coverage_report_view?(project)
+        ::Feature.enabled?(:coverage_report_view, project, default_enabled: true)
       end
 
-      def self.lint_creates_pipeline_with_dry_run?(project)
-        ::Feature.enabled?(:ci_lint_creates_pipeline_with_dry_run, project, default_enabled: true)
+      def self.child_of_child_pipeline_enabled?(project)
+        ::Feature.enabled?(:ci_child_of_child_pipeline, project, default_enabled: true)
       end
 
-      def self.reset_ci_minutes_for_all_namespaces?
-        ::Feature.enabled?(:reset_ci_minutes_for_all_namespaces, default_enabled: false)
+      def self.trace_overwrite?
+        ::Feature.enabled?(:ci_trace_overwrite, type: :ops, default_enabled: false)
       end
 
-      def self.expand_names_for_cross_pipeline_artifacts?(project)
-        ::Feature.enabled?(:ci_expand_names_for_cross_pipeline_artifacts, project)
+      def self.accept_trace?(project)
+        ::Feature.enabled?(:ci_enable_live_trace, project) &&
+          ::Feature.enabled?(:ci_accept_trace, project, type: :ops, default_enabled: false)
+      end
+
+      def self.new_artifact_file_reader_enabled?(project)
+        ::Feature.enabled?(:ci_new_artifact_file_reader, project, default_enabled: false)
       end
     end
   end
 end
-
-::Gitlab::Ci::Features.prepend_if_ee('::EE::Gitlab::Ci::Features')