Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 26 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 6432640570f..9b41fee9ab9 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -223,33 +223,41 @@ Dangerfile @gl-quality/eng-prod
 /ee/lib/gitlab/ci/reports/security/ @gitlab-org/secure/composition-analysis-be @gitlab-org/secure/dynamic-analysis-be @gitlab-org/secure/static-analysis-be @gitlab-org/secure/fuzzing-be
 
 [Container Security]
-/ee/app/views/projects/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend
-/ee/app/assets/javascripts/pages/projects/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend
-/ee/app/assets/javascripts/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend
-/ee/spec/frontend/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend
+/ee/app/views/projects/threat_monitoring/** @gitlab-org/protect/container-security-frontend
+/ee/app/views/projects/security/policies/** @gitlab-org/protect/container-security-frontend
+/ee/spec/views/projects/security/policies/** @gitlab-org/protect/container-security-frontend
+/ee/app/assets/javascripts/pages/projects/threat_monitoring/** @gitlab-org/protect/container-security-frontend
+/ee/app/assets/javascripts/threat_monitoring/** @gitlab-org/protect/container-security-frontend
+/ee/spec/frontend/threat_monitoring/** @gitlab-org/protect/container-security-frontend
 
-/ee/app/controllers/projects/threat_monitoring_controller.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/controllers/projects/threat_monitoring_controller_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/lib/gitlab/kubernetes/cilium_network_policy.rb @gitlab-org/threat-management/defend/container-security/backend
-/spec/lib/gitlab/kubernetes/cilium_network_policy_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/lib/gitlab/kubernetes/network_policy_common.rb @gitlab-org/threat-management/defend/container-security/backend
-/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb @gitlab-org/threat-management/defend/container-security/backend
-/lib/gitlab/kubernetes/network_policy.rb @gitlab-org/threat-management/defend/container-security/backend
-/spec/lib/gitlab/kubernetes/network_policy_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/app/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend
-/ee/app/controllers/projects/security/waf_anomalies_controller.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/controllers/projects/security/waf_anomalies_controller_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/app/models/clusters/applications/cilium.rb @gitlab-org/threat-management/defend/container-security/backend
-/spec/models/clusters/applications/cilium_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/app/controllers/projects/security/network_policies_controller.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/controllers/projects/security/network_policies_controller_spec.rb  @gitlab-org/threat-management/defend/container-security/backend
-/ee/app/workers/network_policy_metrics_worker.rb   @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/workers/network_policy_metrics_worker_spec.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/app/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend
-/ee/lib/gitlab/usage_data_counters/network_policy_counter.rb @gitlab-org/threat-management/defend/container-security/backend
-/ee/spec/lib/gitlab/usage_data_counters/network_policy_counter_spec.rb @gitlab-org/threat-management/defend/container-security/backend
+/ee/app/controllers/projects/threat_monitoring_controller.rb @gitlab-org/protect/container-security-backend
+/ee/spec/controllers/projects/threat_monitoring_controller_spec.rb @gitlab-org/protect/container-security-backend
+/ee/app/controllers/projects/security/policies_controller.rb @gitlab-org/protect/container-security-backend
+/ee/spec/requests/projects/security/policies_controller_spec.rb @gitlab-org/protect/container-security-backend
+/ee/app/models/security/orchestration_policy_configuration.rb @gitlab-org/protect/container-security-backend
+/ee/spec/models/security/orchestration_policy_configuration_spec.rb @gitlab-org/protect/container-security-backend
+/lib/gitlab/kubernetes/cilium_network_policy.rb @gitlab-org/protect/container-security-backend
+/spec/lib/gitlab/kubernetes/cilium_network_policy_spec.rb @gitlab-org/protect/container-security-backend
+/lib/gitlab/kubernetes/network_policy_common.rb @gitlab-org/protect/container-security-backend
+/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb @gitlab-org/protect/container-security-backend
+/lib/gitlab/kubernetes/network_policy.rb @gitlab-org/protect/container-security-backend
+/spec/lib/gitlab/kubernetes/network_policy_spec.rb @gitlab-org/protect/container-security-backend
+/ee/app/services/network_policies/** @gitlab-org/protect/container-security-backend
+/ee/spec/services/network_policies/** @gitlab-org/protect/container-security-backend
+/ee/app/controllers/projects/security/waf_anomalies_controller.rb @gitlab-org/protect/container-security-backend
+/ee/spec/controllers/projects/security/waf_anomalies_controller_spec.rb @gitlab-org/protect/container-security-backend
+/app/models/clusters/applications/cilium.rb @gitlab-org/protect/container-security-backend
+/spec/models/clusters/applications/cilium_spec.rb @gitlab-org/protect/container-security-backend
+/ee/app/controllers/projects/security/network_policies_controller.rb @gitlab-org/protect/container-security-backend
+/ee/spec/controllers/projects/security/network_policies_controller_spec.rb  @gitlab-org/protect/container-security-backend
+/ee/app/workers/network_policy_metrics_worker.rb   @gitlab-org/protect/container-security-backend
+/ee/spec/workers/network_policy_metrics_worker_spec.rb @gitlab-org/protect/container-security-backend
+/ee/app/services/network_policies/** @gitlab-org/protect/container-security-backend
+/ee/spec/services/network_policies/** @gitlab-org/protect/container-security-backend
+/ee/app/services/security/orchestration/** @gitlab-org/protect/container-security-backend
+/ee/spec/services/security/orchestration/** @gitlab-org/protect/container-security-backend
+/ee/lib/gitlab/usage_data_counters/network_policy_counter.rb @gitlab-org/protect/container-security-backend
+/ee/spec/lib/gitlab/usage_data_counters/network_policy_counter_spec.rb @gitlab-org/protect/container-security-backend
 
 [Code Owners]
 /ee/lib/gitlab/code_owners.rb @reprazent @kerrizor @garyh