Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

55 files changed, 251 insertions, 163 deletions

diff --git a/config/feature_flags/development/unify_security_configuration.yml b/config/feature_flags/beta/container_scanning_continuous_vulnerability_scans.yml
index bbc4489ec82..0169f3949c9 100644
--- a/config/feature_flags/development/unify_security_configuration.yml
+++ b/config/feature_flags/beta/container_scanning_continuous_vulnerability_scans.yml
@@ -1,8 +1,9 @@
 ---
-name: unify_security_configuration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76866
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350177
-milestone: '14.7'
-type: development
+name: container_scanning_continuous_vulnerability_scans
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435435
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141023
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437162
+milestone: '16.8'
 group: group::composition analysis
+type: beta
 default_enabled: false
diff --git a/config/feature_flags/beta/group_hierarchy_optimization.yml b/config/feature_flags/beta/group_hierarchy_optimization.yml
new file mode 100644
index 00000000000..194f450aefe
--- /dev/null
+++ b/config/feature_flags/beta/group_hierarchy_optimization.yml
@@ -0,0 +1,9 @@
+---
+name: group_hierarchy_optimization
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433478
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141214
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437604
+milestone: '16.8'
+group: group::optimize
+type: beta
+default_enabled: false
diff --git a/config/feature_flags/beta/prefix_ci_build_tokens.yml b/config/feature_flags/beta/prefix_ci_build_tokens.yml
new file mode 100644
index 00000000000..ed0838b36bd
--- /dev/null
+++ b/config/feature_flags/beta/prefix_ci_build_tokens.yml
@@ -0,0 +1,9 @@
+---
+name: prefix_ci_build_tokens
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426137
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140159
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17299
+milestone: '16.8'
+group: group::pipeline security
+type: beta
+default_enabled: false
diff --git a/config/feature_flags/development/add_branch_rule.yml b/config/feature_flags/development/add_branch_rule.yml
new file mode 100644
index 00000000000..bdbd8d58c71
--- /dev/null
+++ b/config/feature_flags/development/add_branch_rule.yml
@@ -0,0 +1,8 @@
+---
+name: add_branch_rule
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435948
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437003
+milestone: '16.8'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/apollo_boards.yml b/config/feature_flags/development/add_policy_approvers_to_rules.yml
index 09b37f4d2ed..c0e8d804840 100644
--- a/config/feature_flags/development/apollo_boards.yml
+++ b/config/feature_flags/development/add_policy_approvers_to_rules.yml
@@ -1,8 +1,8 @@
 ---
-name: apollo_boards
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102719
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381210
-milestone: '15.6'
+name: add_policy_approvers_to_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138809
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434385
+milestone: '16.8'
 type: development
-group: group::product planning
+group: group::security policies
 default_enabled: true
diff --git a/config/feature_flags/development/clickhouse_ci_analytics.yml b/config/feature_flags/development/agent_registry.yml
index e56d2e19036..7bcdfc76ab1 100644
--- a/config/feature_flags/development/clickhouse_ci_analytics.yml
+++ b/config/feature_flags/development/agent_registry.yml
@@ -1,8 +1,8 @@
 ---
-name: clickhouse_ci_analytics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130211
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424498
-milestone: '16.4'
+name: agent_registry
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140859
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437540
+milestone: '16.8'
 type: development
-group: group::runner
+group: "group::mlops"
 default_enabled: false
diff --git a/config/feature_flags/development/arkose_labs_signup_data_exchange.yml b/config/feature_flags/development/arkose_labs_signup_data_exchange.yml
new file mode 100644
index 00000000000..701a2ee33e9
--- /dev/null
+++ b/config/feature_flags/development/arkose_labs_signup_data_exchange.yml
@@ -0,0 +1,8 @@
+---
+name: arkose_labs_signup_data_exchange
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139070
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435275
+milestone: '16.8'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/create_personal_ns_outside_model.yml b/config/feature_flags/development/bulk_create_scan_result_policies.yml
index ba8a3f7deb3..35a1c5a6deb 100644
--- a/config/feature_flags/development/create_personal_ns_outside_model.yml
+++ b/config/feature_flags/development/bulk_create_scan_result_policies.yml
@@ -1,8 +1,8 @@
 ---
-name: create_personal_ns_outside_model
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139487
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434921
-milestone: '16.7'
+name: bulk_create_scan_result_policies
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139163
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435958
+milestone: '16.8'
 type: development
-group: group::tenant scale
+group: group::security policies
 default_enabled: false
diff --git a/config/feature_flags/development/bulk_import_details_page.yml b/config/feature_flags/development/bulk_import_details_page.yml
deleted file mode 100644
index c8265161233..00000000000
--- a/config/feature_flags/development/bulk_import_details_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: bulk_import_details_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135004
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429109
-milestone: '16.6'
-type: development
-group: group::import and integrate
-default_enabled: true
diff --git a/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml b/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml
index 4bbd0bd5773..72dbf392528 100644
--- a/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml
+++ b/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431561
 milestone: '16.7'
 type: development
 group: group::import and integrate
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/bulk_imports_batched_import_export.yml b/config/feature_flags/development/bulk_imports_batched_import_export.yml
deleted file mode 100644
index bf114b6d0a8..00000000000
--- a/config/feature_flags/development/bulk_imports_batched_import_export.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: bulk_imports_batched_import_export
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124434
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406559
-milestone: '16.2'
-type: development
-group: group::import and integrate
-default_enabled: true
diff --git a/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml b/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
deleted file mode 100644
index 79f7a27eeac..00000000000
--- a/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: cache_control_headers_for_openid_jwks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138405
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433360
-milestone: '16.7'
-type: development
-group: group::pipeline security
-default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/use_gitlab_http_v2.yml b/config/feature_flags/development/ci_workflow_auto_cancel_on_new_commit.yml
index 8a840c48a4b..3b8c7b1e489 100644
--- a/config/feature_flags/development/use_gitlab_http_v2.yml
+++ b/config/feature_flags/development/ci_workflow_auto_cancel_on_new_commit.yml
@@ -1,8 +1,8 @@
 ---
-name: use_gitlab_http_v2
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132742
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426549
-milestone: '16.5'
+name: ci_workflow_auto_cancel_on_new_commit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139358
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434676
+milestone: '16.8'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/code_suggestions_claude21.yml b/config/feature_flags/development/code_suggestions_claude21.yml
new file mode 100644
index 00000000000..d5127fa1b79
--- /dev/null
+++ b/config/feature_flags/development/code_suggestions_claude21.yml
@@ -0,0 +1,9 @@
+---
+name: code_suggestions_claude21
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432636
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140436
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/436273
+milestone: '16.8'
+group: group::code creation
+type: development
+default_enabled: false
diff --git a/config/feature_flags/development/compliance_framework_report_ui.yml b/config/feature_flags/development/compliance_framework_report_ui.yml
index a70869bfeed..257c5808797 100644
--- a/config/feature_flags/development/compliance_framework_report_ui.yml
+++ b/config/feature_flags/development/compliance_framework_report_ui.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425242
 milestone: '16.5'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/compliance_pipeline_in_policies.yml b/config/feature_flags/development/compliance_pipeline_in_policies.yml
index 97432fe2872..427f3dde4b4 100644
--- a/config/feature_flags/development/compliance_pipeline_in_policies.yml
+++ b/config/feature_flags/development/compliance_pipeline_in_policies.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424185
 milestone: '16.4'
 type: development
 group: group::security policies
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/invalid_graphql_auth_401.yml b/config/feature_flags/development/github_import_extended_events.yml
index 668a86cc52f..e4466bf958f 100644
--- a/config/feature_flags/development/invalid_graphql_auth_401.yml
+++ b/config/feature_flags/development/github_import_extended_events.yml
@@ -1,8 +1,8 @@
 ---
-name: invalid_graphql_auth_401
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132149
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426196
-milestone: '16.5'
+name: github_import_extended_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139410
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435089
+milestone: '16.8'
 type: development
 group: group::import and integrate
 default_enabled: false
diff --git a/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml
index fc15ee5f1b9..bc90bd298fc 100644
--- a/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml
+++ b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433213
 milestone: '16.7'
 type: development
 group: group::ai framework
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/group_analytics_dashboards.yml b/config/feature_flags/development/group_analytics_dashboards.yml
index 55001b99452..6609b4d2c7e 100644
--- a/config/feature_flags/development/group_analytics_dashboards.yml
+++ b/config/feature_flags/development/group_analytics_dashboards.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416970
 milestone: '16.2'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/browsersdk_tracking.yml b/config/feature_flags/development/hard_limit_daily_phone_verifications.yml
index 688d559904b..7bf08f24bc6 100644
--- a/config/feature_flags/development/browsersdk_tracking.yml
+++ b/config/feature_flags/development/hard_limit_daily_phone_verifications.yml
@@ -1,8 +1,8 @@
 ---
-name: browsersdk_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129517
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422264
-milestone: '16.4'
+name: hard_limit_daily_phone_verifications
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138627
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433972
+milestone: '16.8'
 type: development
-group: group::analytics instrumentation
+group: group::anti-abuse
 default_enabled: false
diff --git a/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml b/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
deleted file mode 100644
index 299a43ccb9e..00000000000
--- a/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: inherit_higher_access_levels_no_cross_join
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132947
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427238
-milestone: '16.5'
-type: development
-group: group::authentication
-default_enabled: true
diff --git a/config/feature_flags/development/limited_access_modal.yml b/config/feature_flags/development/limited_access_modal.yml
index c9800da0d6c..0e01507a8f9 100644
--- a/config/feature_flags/development/limited_access_modal.yml
+++ b/config/feature_flags/development/limited_access_modal.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129790
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424877
 milestone: '16.4'
 type: development
-group: group::billing and subscription management
+group: group::subscription management
 default_enabled: false
diff --git a/config/feature_flags/development/manage_project_access_tokens.yml b/config/feature_flags/development/manage_project_access_tokens.yml
deleted file mode 100644
index a6cf2cf4f9f..00000000000
--- a/config/feature_flags/development/manage_project_access_tokens.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: manage_project_access_tokens
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132342
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430353
-milestone: '16.5'
-type: development
-group: group::authorization
-default_enabled: false
diff --git a/config/feature_flags/development/vite.yml b/config/feature_flags/development/markdown_rust.yml
index 10242a665e7..2a982525e45 100644
--- a/config/feature_flags/development/vite.yml
+++ b/config/feature_flags/development/markdown_rust.yml
@@ -1,8 +1,8 @@
 ---
-name: vite
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129392
+name: markdown_rust
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139825
 rollout_issue_url:
-milestone: '16.4'
+milestone: '16.8'
 type: development
-group: group::code review
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/always_set_pipeline_failure_reason.yml b/config/feature_flags/development/mention_autocomplete_backend_filtering.yml
index fad54828280..b971308fe67 100644
--- a/config/feature_flags/development/always_set_pipeline_failure_reason.yml
+++ b/config/feature_flags/development/mention_autocomplete_backend_filtering.yml
@@ -1,8 +1,8 @@
 ---
-name: always_set_pipeline_failure_reason
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138390
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434228
+name: mention_autocomplete_backend_filtering
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131250
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435106
 milestone: '16.7'
 type: development
-group: group::pipeline execution
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/user_approval_rules_removal.yml b/config/feature_flags/development/merge_request_diff_generated_subscription.yml
index 96025a8c163..c1803423edc 100644
--- a/config/feature_flags/development/user_approval_rules_removal.yml
+++ b/config/feature_flags/development/merge_request_diff_generated_subscription.yml
@@ -1,8 +1,8 @@
 ---
-name: user_approval_rules_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138691
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434141
-milestone: '16.7'
-type: development
+name: merge_request_diff_generated_subscription
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140287
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435917
+milestone: '16.8'
 group: group::code review
-default_enabled: true
+type: development
+default_enabled: false
diff --git a/config/feature_flags/development/optimize_where_full_path_in.yml b/config/feature_flags/development/optional_personal_namespace.yml
index a47b703a958..acc644933d5 100644
--- a/config/feature_flags/development/optimize_where_full_path_in.yml
+++ b/config/feature_flags/development/optional_personal_namespace.yml
@@ -1,8 +1,8 @@
 ---
-name: optimize_where_full_path_in
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137886
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432863
-milestone: '16.7'
+name: optional_personal_namespace
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137713
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431978
+milestone: '16.8'
 type: development
 group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/packages_dependency_proxy_maven.yml b/config/feature_flags/development/packages_dependency_proxy_maven.yml
deleted file mode 100644
index 8cf2f5a2879..00000000000
--- a/config/feature_flags/development/packages_dependency_proxy_maven.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: packages_dependency_proxy_maven
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123491
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415218
-milestone: '16.2'
-type: development
-group: group::package registry
-default_enabled: false
diff --git a/config/feature_flags/development/use_merge_approval_rules_when_merged.yml b/config/feature_flags/development/pinned_file.yml
index 1b7007a96df..712a35fd790 100644
--- a/config/feature_flags/development/use_merge_approval_rules_when_merged.yml
+++ b/config/feature_flags/development/pinned_file.yml
@@ -1,8 +1,8 @@
 ---
-name: use_merge_approval_rules_when_merged
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129165
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422380
-milestone: '16.4'
+name: pinned_file
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137544
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433250
+milestone: '16.9'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/restyle_login_page.yml b/config/feature_flags/development/prefix_scim_tokens.yml
index 90b56e64c48..297327f26d2 100644
--- a/config/feature_flags/development/restyle_login_page.yml
+++ b/config/feature_flags/development/prefix_scim_tokens.yml
@@ -1,8 +1,8 @@
 ---
-name: restyle_login_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91673
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368387
-milestone: '15.2'
+name: prefix_scim_tokens
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139737
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435423
+milestone: '16.8'
 type: development
 group: group::authentication
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml b/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml
deleted file mode 100644
index e4358224831..00000000000
--- a/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: refresh_statistics_on_unlink_fork
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137197
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432177
-milestone: '16.7'
-type: development
-group: group::utilization
-default_enabled: false
diff --git a/config/feature_flags/development/sast_reports_in_inline_diff.yml b/config/feature_flags/development/sast_reports_in_inline_diff.yml
index 2e320e8e602..78729ed1466 100644
--- a/config/feature_flags/development/sast_reports_in_inline_diff.yml
+++ b/config/feature_flags/development/sast_reports_in_inline_diff.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410191
 milestone: '16.0'
 type: development
 group: group::static analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/self_managed_code_suggestions.yml b/config/feature_flags/development/self_managed_code_suggestions.yml
index 1c0f636bd8b..ccde3fbc75f 100644
--- a/config/feature_flags/development/self_managed_code_suggestions.yml
+++ b/config/feature_flags/development/self_managed_code_suggestions.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432983
 milestone: '16.7'
 type: development
 group: group::purchase
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/sidekiq_job_completion_metric_initialize.yml b/config/feature_flags/development/sidekiq_job_completion_metric_initialize.yml
index 95389b7b5d7..0813a7fcc59 100644
--- a/config/feature_flags/development/sidekiq_job_completion_metric_initialize.yml
+++ b/config/feature_flags/development/sidekiq_job_completion_metric_initialize.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64637
 rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1133
 milestone: '14.1'
 type: development
-group: team::Scalability
+group: group::scalability
 default_enabled: true
diff --git a/config/feature_flags/development/ci_job_token_scope.yml b/config/feature_flags/development/simplified_badges.yml
index aa64f5ba872..95f9b00d306 100644
--- a/config/feature_flags/development/ci_job_token_scope.yml
+++ b/config/feature_flags/development/simplified_badges.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_job_token_scope
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49750
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300821
-milestone: '13.12'
+name: simplified_badges
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140231
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437861
+milestone: '16.8'
 type: development
-group: group::container registry
+group: group::ux paper cuts
 default_enabled: false
diff --git a/config/feature_flags/development/simplified_labels.yml b/config/feature_flags/development/simplified_labels.yml
new file mode 100644
index 00000000000..95619cd5ea5
--- /dev/null
+++ b/config/feature_flags/development/simplified_labels.yml
@@ -0,0 +1,8 @@
+---
+name: simplified_labels
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140239
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437859
+milestone: '16.8'
+type: development
+group: group::ux paper cuts
+default_enabled: false
diff --git a/config/feature_flags/development/sms_send_wait_time.yml b/config/feature_flags/development/sms_send_wait_time.yml
new file mode 100644
index 00000000000..e4cde3477ca
--- /dev/null
+++ b/config/feature_flags/development/sms_send_wait_time.yml
@@ -0,0 +1,8 @@
+---
+name: sms_send_wait_time
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137850
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432975
+milestone: '16.8'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/truncate_ci_merge_request_description.yml b/config/feature_flags/development/truncate_ci_merge_request_description.yml
deleted file mode 100644
index 816632f0da2..00000000000
--- a/config/feature_flags/development/truncate_ci_merge_request_description.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: truncate_ci_merge_request_description
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139605
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435099
-milestone: '16.7'
-type: development
-group: group::pipeline security
-default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml b/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml
deleted file mode 100644
index 64377eacd5d..00000000000
--- a/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: updated_ai_powered_features_menu_for_sm
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138337
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433255
-milestone: '16.7'
-type: development
-group: group::cloud connector
-default_enabled: false
diff --git a/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml b/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml
deleted file mode 100644
index edc696fc9ac..00000000000
--- a/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_500_page_size_for_contribution_analytics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136724
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431595
-milestone: '16.7'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/experiment/in_product_guidance_environments_webide.yml b/config/feature_flags/experiment/default_to_import_tab.yml
index 167a70747a0..6d15cc57bb0 100644
--- a/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
+++ b/config/feature_flags/experiment/default_to_import_tab.yml
@@ -1,8 +1,8 @@
 ---
-name: in_product_guidance_environments_webide
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57160
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330390
-milestone: '13.12'
+name: default_to_import_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139681
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435211
+milestone: '16.8'
 type: experiment
-group: group::environments
+group: group::activation
 default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/allow_members_to_see_invited_groups_in_access_dropdowns.yml b/config/feature_flags/gitlab_com_derisk/allow_members_to_see_invited_groups_in_access_dropdowns.yml
new file mode 100644
index 00000000000..5f394ef3fd3
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/allow_members_to_see_invited_groups_in_access_dropdowns.yml
@@ -0,0 +1,9 @@
+---
+name: allow_members_to_see_invited_groups_in_access_dropdowns
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345140
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140927
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17364
+milestone: '16.8'
+group: group::source code
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/batch_route_updates.yml b/config/feature_flags/gitlab_com_derisk/batch_route_updates.yml
new file mode 100644
index 00000000000..8eae0d54435
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/batch_route_updates.yml
@@ -0,0 +1,9 @@
+---
+name: batch_route_updates
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432065
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139782
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17360
+milestone: '16.8'
+group: group::tenant scale
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/enhanced_review_email.yml b/config/feature_flags/gitlab_com_derisk/enhanced_review_email.yml
new file mode 100644
index 00000000000..71bdc424ec2
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/enhanced_review_email.yml
@@ -0,0 +1,9 @@
+---
+name: enhanced_review_email
+feature_issue_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141187
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437582
+milestone: '16.8'
+group: group::code review
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml b/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml
new file mode 100644
index 00000000000..ab068225d2c
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml
@@ -0,0 +1,9 @@
+---
+name: github_importer_attachments
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/436400
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140524
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17318
+milestone: '16.8'
+group: group::import and integrate
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/namespace_descendants_cache_expiration.yml b/config/feature_flags/gitlab_com_derisk/namespace_descendants_cache_expiration.yml
new file mode 100644
index 00000000000..d374316e271
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/namespace_descendants_cache_expiration.yml
@@ -0,0 +1,9 @@
+---
+name: namespace_descendants_cache_expiration
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433482
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141588
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17388
+milestone: '16.8'
+group: group::optimize
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml b/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml
new file mode 100644
index 00000000000..3edb367f5a2
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml
@@ -0,0 +1,9 @@
+---
+name: prevent_modifications_of_mr_rules_post_merge
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432961
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138154
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17331
+milestone: '16.8'
+group: group::code review
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/update_organization_users.yml b/config/feature_flags/gitlab_com_derisk/update_organization_users.yml
new file mode 100644
index 00000000000..09074850150
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/update_organization_users.yml
@@ -0,0 +1,9 @@
+---
+name: update_organization_users
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419366
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139188
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435868
+milestone: '16.8'
+group: group::tenant scale
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/ops/ai_duo_chat_switch.yml b/config/feature_flags/ops/ai_duo_chat_switch.yml
new file mode 100644
index 00000000000..cd3fe3ab937
--- /dev/null
+++ b/config/feature_flags/ops/ai_duo_chat_switch.yml
@@ -0,0 +1,9 @@
+---
+name: ai_duo_chat_switch
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434802
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140352
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17301
+milestone: '16.8'
+group: group::ai framework
+type: ops
+default_enabled: true
diff --git a/config/feature_flags/ops/ci_unlock_pipelines_extra_low.yml b/config/feature_flags/ops/ci_unlock_pipelines_extra_low.yml
new file mode 100644
index 00000000000..9a02adccac3
--- /dev/null
+++ b/config/feature_flags/ops/ci_unlock_pipelines_extra_low.yml
@@ -0,0 +1,9 @@
+---
+name: ci_unlock_pipelines_extra_low
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435051
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140318
+rollout_issue_url:
+milestone: '16.7'
+group: group::pipeline security
+type: ops
+default_enabled: false
diff --git a/config/feature_flags/development/telesign_intelligence.yml b/config/feature_flags/ops/telesign_intelligence.yml
index 5d824f4025b..de87f48e2b6 100644
--- a/config/feature_flags/development/telesign_intelligence.yml
+++ b/config/feature_flags/ops/telesign_intelligence.yml
@@ -3,6 +3,6 @@ name: telesign_intelligence
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137739
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432757
 milestone: '16.7'
-type: development
+type: ops
 group: group::anti-abuse
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/undefined/gitaly_pack_objects_hook_with_sidechannel.yml b/config/feature_flags/undefined/gitaly_pack_objects_hook_with_sidechannel.yml
index a09daecbfa5..1ef7a93f205 100644
--- a/config/feature_flags/undefined/gitaly_pack_objects_hook_with_sidechannel.yml
+++ b/config/feature_flags/undefined/gitaly_pack_objects_hook_with_sidechannel.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3758
 rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1187
 milestone: '14.3'
 type: undefined
-group: 'team::Scalability'
+group: group::scalability
 default_enabled: false
diff --git a/config/feature_flags/wip/disable_ci_partition_pruning.yml b/config/feature_flags/wip/disable_ci_partition_pruning.yml
new file mode 100644
index 00000000000..91e07c50ba2
--- /dev/null
+++ b/config/feature_flags/wip/disable_ci_partition_pruning.yml
@@ -0,0 +1,9 @@
+---
+name: disable_ci_partition_pruning
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435737
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140355
+rollout_issue_url:
+milestone: '16.8'
+group: group::pipeline execution
+type: wip
+default_enabled: false
diff --git a/config/feature_flags/wip/epic_creation_with_synced_work_item.yml b/config/feature_flags/wip/epic_creation_with_synced_work_item.yml
new file mode 100644
index 00000000000..2083ca694d1
--- /dev/null
+++ b/config/feature_flags/wip/epic_creation_with_synced_work_item.yml
@@ -0,0 +1,9 @@
+---
+name: epic_creation_with_synced_work_item
+feature_issue_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140232
+rollout_issue_url:
+milestone: '16.9'
+group: group::product planning
+type: wip
+default_enabled: false
diff --git a/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml b/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml
new file mode 100644
index 00000000000..75234433e44
--- /dev/null
+++ b/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml
@@ -0,0 +1,9 @@
+---
+name: vulnerability_owasp_top_10_group
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432618
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140205
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437253
+milestone: '16.8'
+group: group::threat insights
+type: wip
+default_enabled: false