Add latest changes from gitlab-org/gitlab@master

8 files changed, 18 insertions, 26 deletions

diff --git a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
index bba3ac4024d..ad28a90c4bc 100644
--- a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
+++ b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
index 8e103c7acc2..d1c69423515 100644
--- a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
+++ b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
index b48e2de6055..240bdee0374 100644
--- a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
+++ b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
@@ -10,15 +10,15 @@ identifiers:
 #- project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
 distributions:
 #- ce
 - ee
-tiers: 
+tiers:
 #- free
 - premium
 - ultimate
diff --git a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
index 4be2df48fb3..b1a92a54032 100644
--- a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
+++ b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
@@ -10,15 +10,15 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
 distributions:
 #- ce
 - ee
-tiers: 
+tiers:
 #- free
 - premium
 - ultimate
diff --git a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
index 31f45f21695..81a97017956 100644
--- a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
+++ b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
index 062f5363ef1..703887818b6 100644
--- a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
+++ b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
@@ -10,8 +10,8 @@ identifiers:
 - project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml b/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml
deleted file mode 100644
index 452c6ed8331..00000000000
--- a/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_artifacts_upload_to_final_location
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106740'
-rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/385447'
-milestone: '16.0'
-type: development
-group: group::pipeline security
-default_enabled: false
diff --git a/config/feature_flags/development/stale_pending_direct_uploads_cleaner.yml b/config/feature_flags/development/disable_all_mention.yml
index f9bf9833f20..1ce939683f4 100644
--- a/config/feature_flags/development/stale_pending_direct_uploads_cleaner.yml
+++ b/config/feature_flags/development/disable_all_mention.yml
@@ -1,8 +1,8 @@
 ---
-name: stale_pending_direct_uploads_cleaner
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117746
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385447
+name: disable_all_mention
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110586
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415280
 milestone: '16.1'
 type: development
-group: group::pipeline security
+group: group::project management
 default_enabled: false