Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

105 files changed, 249 insertions, 327 deletions

diff --git a/config/feature_flags/development/approval_rules_pagination.yml b/config/feature_flags/development/add_refresh_pull_mirror_worker.yml
index 78d4ad37ced..f59f0ff3d8e 100644
--- a/config/feature_flags/development/approval_rules_pagination.yml
+++ b/config/feature_flags/development/add_refresh_pull_mirror_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: approval_rules_pagination
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91702
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366823
-milestone: '15.2'
+name: add_refresh_pull_mirror_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103665
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382226
+milestone: '15.7'
 type: development
 group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/allow_dots_on_tf_state_names.yml b/config/feature_flags/development/allow_dots_on_tf_state_names.yml
new file mode 100644
index 00000000000..3bbff808eda
--- /dev/null
+++ b/config/feature_flags/development/allow_dots_on_tf_state_names.yml
@@ -0,0 +1,8 @@
+---
+name: allow_dots_on_tf_state_names
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106861
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385597
+milestone: '15.7'
+type: development
+group: group::configure
+default_enabled: false
diff --git a/config/feature_flags/development/always_async_project_authorizations_refresh.yml b/config/feature_flags/development/always_async_project_authorizations_refresh.yml
deleted file mode 100644
index f5ec2473af8..00000000000
--- a/config/feature_flags/development/always_async_project_authorizations_refresh.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: always_async_project_authorizations_refresh
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92333
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367683
-milestone: '15.3'
-type: development
-group: group::workspace
-default_enabled: true
diff --git a/config/feature_flags/development/ban_user_feature_flag.yml b/config/feature_flags/development/ban_user_feature_flag.yml
index d06a0668549..74aee3f46f8 100644
--- a/config/feature_flags/development/ban_user_feature_flag.yml
+++ b/config/feature_flags/development/ban_user_feature_flag.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61292
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330667
 milestone: '13.12'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: true
diff --git a/config/feature_flags/development/batched_migrations_parallel_execution.yml b/config/feature_flags/development/batched_migrations_parallel_execution.yml
new file mode 100644
index 00000000000..8cd030b8912
--- /dev/null
+++ b/config/feature_flags/development/batched_migrations_parallel_execution.yml
@@ -0,0 +1,8 @@
+---
+name: batched_migrations_parallel_execution
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104027
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384883
+milestone: '15.7'
+type: development
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/ci_retry_job_fix.yml b/config/feature_flags/development/cache_project_integrations.yml
index 30782e57dea..3bb652d4b51 100644
--- a/config/feature_flags/development/ci_retry_job_fix.yml
+++ b/config/feature_flags/development/cache_project_integrations.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_retry_job_fix
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100712
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207988
-milestone: '15.6'
+name: cache_project_integrations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104062
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384004
+milestone: '15.7'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/check_ip_address_for_email_verification.yml b/config/feature_flags/development/check_ip_address_for_email_verification.yml
new file mode 100644
index 00000000000..1d0c640d9a4
--- /dev/null
+++ b/config/feature_flags/development/check_ip_address_for_email_verification.yml
@@ -0,0 +1,8 @@
+---
+name: check_ip_address_for_email_verification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106441
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385196
+milestone: "15.7"
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/run_pipeline_graphql.yml b/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml
index 78d8afbbee5..503e676d4ab 100644
--- a/config/feature_flags/development/run_pipeline_graphql.yml
+++ b/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml
@@ -1,8 +1,8 @@
 ---
-name: run_pipeline_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96633
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372310
-milestone: '15.4'
+name: ci_bridge_remove_sourced_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105708
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384359
+milestone: '15.7'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/block_weak_passwords.yml b/config/feature_flags/development/ci_build_partition_id_token_prefix.yml
index aaa8c2cac38..5b3cd22a489 100644
--- a/config/feature_flags/development/block_weak_passwords.yml
+++ b/config/feature_flags/development/ci_build_partition_id_token_prefix.yml
@@ -1,8 +1,8 @@
 ---
-name: block_weak_passwords
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86310
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363445
-milestone: '15.4'
+name: ci_build_partition_id_token_prefix
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106179
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385401
+milestone: '15.7'
 type: development
-group: group::authentication and authorization
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml b/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml
index 179fef03d5e..14c435f294a 100644
--- a/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml
+++ b/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_assign_job_token_on_scheduling
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103377
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382042
-milestone: '15.6'
+name: ci_enforce_rate_limits_jobs_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104912
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384186
+milestone: '15.7'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/pipeline_tabs_vue.yml b/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml
index 848166d2cc1..42afd4235cc 100644
--- a/config/feature_flags/development/pipeline_tabs_vue.yml
+++ b/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml
@@ -1,8 +1,8 @@
 ---
-name: pipeline_tabs_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80401
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353118
-milestone: '14.10'
+name: ci_hooks_pre_get_sources_script
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102332
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381840
+milestone: '15.6'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_job_token_scope.yml b/config/feature_flags/development/ci_job_token_scope.yml
index 464fc77a69e..c86a3eca25d 100644
--- a/config/feature_flags/development/ci_job_token_scope.yml
+++ b/config/feature_flags/development/ci_job_token_scope.yml
@@ -4,5 +4,5 @@ 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'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
index ab135526c0b..0b6fc6022f4 100644
--- a/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
+++ b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375034
 milestone: '15.6'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/graphql_job_app.yml b/config/feature_flags/development/ci_refactoring_external_mapper.yml
index a0f0cb71e17..22933d253d4 100644
--- a/config/feature_flags/development/graphql_job_app.yml
+++ b/config/feature_flags/development/ci_refactoring_external_mapper.yml
@@ -1,8 +1,8 @@
 ---
-name: graphql_job_app
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96703
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372276 
-milestone: '15.4'
+name: ci_refactoring_external_mapper
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106408
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385179
+milestone: '15.7'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_register_job_temporary_lock.yml b/config/feature_flags/development/ci_register_job_temporary_lock.yml
index f404df8f85b..d839669b2ea 100644
--- a/config/feature_flags/development/ci_register_job_temporary_lock.yml
+++ b/config/feature_flags/development/ci_register_job_temporary_lock.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55202
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323180
 milestone: '13.10'
 type: development
-group: group::memory
+group: group::pipeline excution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_reuse_build_in_seed_context.yml b/config/feature_flags/development/ci_reuse_build_in_seed_context.yml
new file mode 100644
index 00000000000..aa63b8d898f
--- /dev/null
+++ b/config/feature_flags/development/ci_reuse_build_in_seed_context.yml
@@ -0,0 +1,8 @@
+---
+name: ci_reuse_build_in_seed_context
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105492
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384577
+milestone: '15.7'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/collect_package_events.yml b/config/feature_flags/development/collect_package_events.yml
index 488dce6a724..68ceb596d8a 100644
--- a/config/feature_flags/development/collect_package_events.yml
+++ b/config/feature_flags/development/collect_package_events.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45802
 rollout_issue_url: 
 milestone: '13.6'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml b/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml
deleted file mode 100644
index ef531228398..00000000000
--- a/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: container_registry_delete_repository_with_cron_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101918
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378818
-milestone: '15.6'
-type: development
-group: group::container registry
-default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml b/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml
index 8b952b79f9b..3fbe5acb0d1 100644
--- a/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml
+++ b/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78613
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml
index 6742a006519..bcb116ea98e 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83135
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.10'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml
index 846bc8b690b..2d47d608f2d 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml
index fcbcc5bfb48..c03c063d9a2 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml
index 11e66a5531e..febf7d323b4 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85277
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.10'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml
index b52693e0aba..35a33ebd281 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml
index f26ddd99607..2f35c3105fc 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86543
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '15.1'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml
index 544354f1b84..80903b0a522 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85908
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '15.0'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml
index f6a5ae36c07..6635151fe19 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88997
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '15.1'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_enabled.yml b/config/feature_flags/development/container_registry_migration_phase2_enabled.yml
index c48cbdb435e..a4c5d7bffa0 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_enabled.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_enabled.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml
index 9a312161824..587096b0890 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml
index f02259be928..531b5b0549f 100644
--- a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml
+++ b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '14.8'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/debian_group_packages.yml b/config/feature_flags/development/debian_group_packages.yml
index bc0c2eaf8eb..63a9220369d 100644
--- a/config/feature_flags/development/debian_group_packages.yml
+++ b/config/feature_flags/development/debian_group_packages.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66188
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336536
 milestone: '14.1'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/debian_packages.yml b/config/feature_flags/development/debian_packages.yml
index 98bc5d898a5..077c75b9f57 100644
--- a/config/feature_flags/development/debian_packages.yml
+++ b/config/feature_flags/development/debian_packages.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42670
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337288
 milestone: '13.5'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
deleted file mode 100644
index 6adfba96e10..00000000000
--- a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: disable_metric_dashboard_refresh_rate
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37195
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229841
-milestone: '13.2'
-type: development
-group: group::respond
-default_enabled: false
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
index 50c22b52d11..71146d9236b 100644
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918
 milestone: '13.5'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml b/config/feature_flags/development/enable_environments_search_within_folder.yml
index 7cb79c05774..a03b31ffbfc 100644
--- a/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml
+++ b/config/feature_flags/development/enable_environments_search_within_folder.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_update_unlocked_job_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70235
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343465
-milestone: '14.5'
+name: enable_environments_search_within_folder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102227/diffs
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382108
+milestone: '15.7'
 type: development
-group: group::pipeline insights
+group: group::release
 default_enabled: true
diff --git a/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml
index cacc564df73..846052dc76f 100644
--- a/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml
+++ b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373672
 milestone: '15.4'
 type: development
 group: group::workspace
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/require_approval_on_scan_removal.yml b/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml
index 2cbbe8e49f8..e72dc713e02 100644
--- a/config/feature_flags/development/require_approval_on_scan_removal.yml
+++ b/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml
@@ -1,8 +1,8 @@
 ---
-name: require_approval_on_scan_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102631
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382079
-milestone: '15.6'
+name: enforce_scan_result_policies_for_preexisting_vulnerabilities
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105248
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384260
+milestone: '15.7'
 type: development
 group: group::security policies
 default_enabled: false
diff --git a/config/feature_flags/development/enhanced_webhook_support_regex.yml b/config/feature_flags/development/enhanced_webhook_support_regex.yml
deleted file mode 100644
index 2c0d2c82dbf..00000000000
--- a/config/feature_flags/development/enhanced_webhook_support_regex.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: enhanced_webhook_support_regex
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97235
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375728
-milestone: '15.6'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml b/config/feature_flags/development/environment_details_vue.yml
index 71c2aa735a2..5a647f65a7a 100644
--- a/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml
+++ b/config/feature_flags/development/environment_details_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_partitioning_use_ci_builds_metadata_routing_table
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100935"
-rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/378601"
-milestone: '15.6'
+name: environment_details_vue
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105527"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/384914"
+milestone: '15.7'
 type: development
-group: "group::pipeline execution"
+group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/markup_rendering_timeout.yml b/config/feature_flags/development/fork_divergence_counts.yml
index 6c579ebe28a..929e9fae790 100644
--- a/config/feature_flags/development/markup_rendering_timeout.yml
+++ b/config/feature_flags/development/fork_divergence_counts.yml
@@ -1,8 +1,8 @@
 ---
-name: markup_rendering_timeout
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89509
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365358
-milestone: '15.1'
+name: fork_divergence_counts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103814
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382878
+milestone: '15.7'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/forti_authenticator.yml b/config/feature_flags/development/forti_authenticator.yml
index f3360d136ec..63e780ccc64 100644
--- a/config/feature_flags/development/forti_authenticator.yml
+++ b/config/feature_flags/development/forti_authenticator.yml
@@ -1,8 +1,8 @@
 ---
 name: forti_authenticator
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45055
-rollout_issue_url: 
+rollout_issue_url:
 milestone: '13.5'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/forti_token_cloud.yml b/config/feature_flags/development/forti_token_cloud.yml
index 10f143ca912..5bf350c9b33 100644
--- a/config/feature_flags/development/forti_token_cloud.yml
+++ b/config/feature_flags/development/forti_token_cloud.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49089
 rollout_issue_url:
 milestone: '13.7'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/geo_container_repository_replication.yml b/config/feature_flags/development/geo_container_repository_replication.yml
deleted file mode 100644
index 94682cc63cc..00000000000
--- a/config/feature_flags/development/geo_container_repository_replication.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: geo_container_repository_replication
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93690"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366662
-milestone: '15.5'
-type: development
-group: group::geo
-default_enabled: true
diff --git a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml b/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml
new file mode 100644
index 00000000000..7ff87410458
--- /dev/null
+++ b/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml
@@ -0,0 +1,8 @@
+---
+name: github_client_fetch_repos_via_graphql
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105824
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385649
+milestone: '15.7'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml b/config/feature_flags/development/gitlab_metrics_error_rate_sli.yml
index d6b28c28600..30b872343ce 100644
--- a/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml
+++ b/config/feature_flags/development/gitlab_metrics_error_rate_sli.yml
@@ -1,8 +1,8 @@
 ---
-name: verify_gitlab_shell_worker_method_names
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103783
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470
-milestone: '15.6'
+name: gitlab_metrics_error_rate_sli
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103976
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383071
+milestone: '15.7'
 type: development
 group: group::scalability
 default_enabled: false
diff --git a/config/feature_flags/development/actors_aware_gitaly_calls.yml b/config/feature_flags/development/gitlab_pat_auto_revocation.yml
index 0ae6140c579..3bbbadac23f 100644
--- a/config/feature_flags/development/actors_aware_gitaly_calls.yml
+++ b/config/feature_flags/development/gitlab_pat_auto_revocation.yml
@@ -1,8 +1,8 @@
 ---
-name: actors_aware_gitaly_calls
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101218
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381516
+name: gitlab_pat_auto_revocation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103713
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382610
 milestone: '15.6'
 type: development
-group: group::gitaly
+group: group::static analysis
 default_enabled: false
diff --git a/config/feature_flags/development/global_search_error_rate_sli.yml b/config/feature_flags/development/global_search_error_rate_sli.yml
deleted file mode 100644
index d1637ad692c..00000000000
--- a/config/feature_flags/development/global_search_error_rate_sli.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: global_search_error_rate_sli
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96667
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373800
-milestone: '15.4'
-type: development
-group: group::application performance
-default_enabled: false
diff --git a/config/feature_flags/development/go_proxy.yml b/config/feature_flags/development/go_proxy.yml
index 4ec5dc786fd..ead133232e4 100644
--- a/config/feature_flags/development/go_proxy.yml
+++ b/config/feature_flags/development/go_proxy.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27746
 rollout_issue_url: 
 milestone: '13.1'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
index f361d3392ec..5cf5ff528af 100644
--- a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
+++ b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34338
 rollout_issue_url: 
 milestone: '13.1'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml b/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
deleted file mode 100644
index 7b4c884a82f..00000000000
--- a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_keyset_pagination_without_next_page_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97509
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373792
-milestone: '15.4'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/group_protected_branches.yml b/config/feature_flags/development/group_protected_branches.yml
new file mode 100644
index 00000000000..4d580734dc4
--- /dev/null
+++ b/config/feature_flags/development/group_protected_branches.yml
@@ -0,0 +1,8 @@
+---
+name: group_protected_branches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372816
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383178
+milestone: '15.7'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/harbor_registry_integration.yml b/config/feature_flags/development/harbor_registry_integration.yml
index 84d9709ca30..f1786f53c19 100644
--- a/config/feature_flags/development/harbor_registry_integration.yml
+++ b/config/feature_flags/development/harbor_registry_integration.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81593
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353595
 milestone: '14.9'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/hash_based_cache_for_protected_branches.yml b/config/feature_flags/development/hash_based_cache_for_protected_branches.yml
index 4e071707182..58372ff3516 100644
--- a/config/feature_flags/development/hash_based_cache_for_protected_branches.yml
+++ b/config/feature_flags/development/hash_based_cache_for_protected_branches.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368279
 milestone: '15.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/hide_public_email_on_profile.yml b/config/feature_flags/development/hide_public_email_on_profile.yml
index 87ed700c359..acf8e4e9ca7 100644
--- a/config/feature_flags/development/hide_public_email_on_profile.yml
+++ b/config/feature_flags/development/hide_public_email_on_profile.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79717
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351731
 milestone: '14.8'
 type: development
-group: group::optimize
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/integrated_error_tracking.yml b/config/feature_flags/development/integrated_error_tracking.yml
index fb302daed57..33b7b20ab29 100644
--- a/config/feature_flags/development/integrated_error_tracking.yml
+++ b/config/feature_flags/development/integrated_error_tracking.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81767
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353956
 milestone: '14.9'
 type: development
-group: group::respond
+group: group::observability
 default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml b/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml
deleted file mode 100644
index 05232d0f80a..00000000000
--- a/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jira_connect_oauth_self_managed_setting
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100725
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377679
-milestone: '15.6'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/limit_assigned_issues_count.yml b/config/feature_flags/development/limit_assigned_issues_count.yml
new file mode 100644
index 00000000000..7fb58220f26
--- /dev/null
+++ b/config/feature_flags/development/limit_assigned_issues_count.yml
@@ -0,0 +1,8 @@
+---
+name: limit_assigned_issues_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105759
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384363
+milestone: '15.7'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/linear_group_descendants_finder_upto.yml b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
index ef045ebfa7a..db3a37191ff 100644
--- a/config/feature_flags/development/linear_group_descendants_finder_upto.yml
+++ b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78991
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350972
 milestone: '14.8'
 type: development
-group: group::authentication and authorization
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/linear_project_ancestors.yml b/config/feature_flags/development/linear_project_ancestors.yml
index 28c8fbcbf59..00b04b20b30 100644
--- a/config/feature_flags/development/linear_project_ancestors.yml
+++ b/config/feature_flags/development/linear_project_ancestors.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68072
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338403
 milestone: '14.2'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/linear_user_manageable_groups.yml b/config/feature_flags/development/linear_user_manageable_groups.yml
index e5822fc3d7d..8d59d689f6e 100644
--- a/config/feature_flags/development/linear_user_manageable_groups.yml
+++ b/config/feature_flags/development/linear_user_manageable_groups.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68845
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339434
 milestone: '14.3'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/maven_central_request_forwarding.yml b/config/feature_flags/development/maven_central_request_forwarding.yml
index 756a931b3a1..46e4cbe5aca 100644
--- a/config/feature_flags/development/maven_central_request_forwarding.yml
+++ b/config/feature_flags/development/maven_central_request_forwarding.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85299
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359553
 milestone: '15.4'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml b/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml
deleted file mode 100644
index 5c3c76dd252..00000000000
--- a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: metrics_dashboard_exhaustive_validations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40103
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241697
-milestone: '13.4'
-type: development
-group: group::respond
-default_enabled: false
diff --git a/config/feature_flags/development/allow_audit_event_type_filtering.yml b/config/feature_flags/development/mirror_only_branches_match_regex.yml
index e5cbd2fddcf..6494569b364 100644
--- a/config/feature_flags/development/allow_audit_event_type_filtering.yml
+++ b/config/feature_flags/development/mirror_only_branches_match_regex.yml
@@ -1,8 +1,8 @@
 ---
-name: allow_audit_event_type_filtering
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102502
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373833
+name: mirror_only_branches_match_regex
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99201
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381667
 milestone: '15.6'
 type: development
-group: group::compliance
+group: "group::source code"
 default_enabled: false
diff --git a/config/feature_flags/development/mr_compare_dropdowns.yml b/config/feature_flags/development/mr_compare_dropdowns.yml
new file mode 100644
index 00000000000..bffab02389b
--- /dev/null
+++ b/config/feature_flags/development/mr_compare_dropdowns.yml
@@ -0,0 +1,8 @@
+---
+name: mr_compare_dropdowns
+introduced_by_url: 
+rollout_issue_url: 
+milestone: '15.7'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
new file mode 100644
index 00000000000..c282313f409
--- /dev/null
+++ b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
@@ -0,0 +1,8 @@
+---
+name: multiple_environment_approval_rules_fe
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105719
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384334
+milestone: '15.7'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/ci_secure_files.yml b/config/feature_flags/development/new_fonts.yml
index a1aa82fe298..20bf283e704 100644
--- a/config/feature_flags/development/ci_secure_files.yml
+++ b/config/feature_flags/development/new_fonts.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_secure_files
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78227
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350748
-milestone: '14.8'
+name: new_fonts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102347
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379147
+milestone: '15.7'
 type: development
-group: group::incubation
+group: group::foundations
 default_enabled: false
diff --git a/config/feature_flags/development/dast_api_scanner.yml b/config/feature_flags/development/on_demand_scans_runner_tags.yml
index 5cc268ee9b9..e25c6f8e3d1 100644
--- a/config/feature_flags/development/dast_api_scanner.yml
+++ b/config/feature_flags/development/on_demand_scans_runner_tags.yml
@@ -1,8 +1,8 @@
 ---
-name: dast_api_scanner
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73564
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345837
-milestone: '14.7'
+name: on_demand_scans_runner_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103634
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381910
+milestone: '15.7'
 type: development
 group: group::dynamic analysis
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/operational_vulnerabilities_filters.yml b/config/feature_flags/development/operational_vulnerabilities_filters.yml
deleted file mode 100644
index 93206935a94..00000000000
--- a/config/feature_flags/development/operational_vulnerabilities_filters.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: operational_vulnerabilities_filters
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90845
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365986
-milestone: '15.2'
-type: development
-group: group::container security
-default_enabled: true
diff --git a/config/feature_flags/development/optimized_housekeeping.yml b/config/feature_flags/development/optimized_housekeeping.yml
index 9a5b9244116..478d5ee22e7 100644
--- a/config/feature_flags/development/optimized_housekeeping.yml
+++ b/config/feature_flags/development/optimized_housekeeping.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353607
 milestone: '14.9'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/package_registry_access_level.yml b/config/feature_flags/development/package_registry_access_level.yml
index 093315f77bd..3434e7f4260 100644
--- a/config/feature_flags/development/package_registry_access_level.yml
+++ b/config/feature_flags/development/package_registry_access_level.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82808
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363018
 milestone: '15.0'
 type: development
-group: group::package
-default_enabled: false
+group: group::package registry
+default_enabled: true
diff --git a/config/feature_flags/development/pipeline_name.yml b/config/feature_flags/development/pipeline_name.yml
index 40557a7d01e..9070e754fff 100644
--- a/config/feature_flags/development/pipeline_name.yml
+++ b/config/feature_flags/development/pipeline_name.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376095
 milestone: '15.5'
 type: development
 group: group::delivery
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/project_list_filter_bar.yml b/config/feature_flags/development/pipeline_name_search.yml
index 29d5d67af95..ccf4f4a6c9c 100644
--- a/config/feature_flags/development/project_list_filter_bar.yml
+++ b/config/feature_flags/development/pipeline_name_search.yml
@@ -1,8 +1,8 @@
 ---
-name: project_list_filter_bar
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/11209
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321404
-milestone: '11.11'
+name: pipeline_name_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107086
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385864
+milestone: '15.7'
 type: development
-group: group::access
+group: group::delivery
 default_enabled: false
diff --git a/config/feature_flags/development/prometheus_computed_alerts.yml b/config/feature_flags/development/project_language_search.yml
index 97912685fb5..2d8c24650d1 100644
--- a/config/feature_flags/development/prometheus_computed_alerts.yml
+++ b/config/feature_flags/development/project_language_search.yml
@@ -1,8 +1,8 @@
 ---
-name: prometheus_computed_alerts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13443
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255304
-milestone: '12.0'
+name: project_language_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104167
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385465
+milestone: '15.7'
 type: development
-group: group::respond
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/projects_preloader_fix.yml b/config/feature_flags/development/projects_preloader_fix.yml
index 1ad578f11a4..58c56257028 100644
--- a/config/feature_flags/development/projects_preloader_fix.yml
+++ b/config/feature_flags/development/projects_preloader_fix.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378858
 milestone: '15.6'
 type: development
 group: group::workspace
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml b/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml
index 67a465ef6d6..667c0db7ee0 100644
--- a/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml
+++ b/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367998
 milestone: '15.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/realtime_mr_status_change.yml b/config/feature_flags/development/realtime_mr_status_change.yml
new file mode 100644
index 00000000000..0cba2d3ca57
--- /dev/null
+++ b/config/feature_flags/development/realtime_mr_status_change.yml
@@ -0,0 +1,8 @@
+---
+name: realtime_mr_status_change
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103011
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385077
+milestone: '15.7'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml
index 503eb95dd62..c4ef2e4be9d 100644
--- a/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml
+++ b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88292
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543
 milestone: '15.1'
 type: development
-group: group::package
+group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/root_statistics_worker_read_replica.yml b/config/feature_flags/development/root_statistics_worker_read_replica.yml
deleted file mode 100644
index 516bead1ee7..00000000000
--- a/config/feature_flags/development/root_statistics_worker_read_replica.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: root_statistics_worker_read_replica
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102516
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379678
-milestone: '15.6'
-type: development
-group: group::utilization
-default_enabled: false
diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase3.yml b/config/feature_flags/development/route_hll_to_snowplow_phase3.yml
new file mode 100644
index 00000000000..5a000a0569a
--- /dev/null
+++ b/config/feature_flags/development/route_hll_to_snowplow_phase3.yml
@@ -0,0 +1,8 @@
+---
+name: route_hll_to_snowplow_phase3
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104947
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383657
+milestone: '15.7'
+type: development
+group: 'group::product intelligence'
+default_enabled: false
diff --git a/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml b/config/feature_flags/development/route_hll_to_snowplow_phase4.yml
index 71d5836bee1..a4109b15533 100644
--- a/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml
+++ b/config/feature_flags/development/route_hll_to_snowplow_phase4.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_skip_auto_cancelation_on_child_pipelines
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100854"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377712
-milestone: '15.5'
+name: route_hll_to_snowplow_phase4
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103528"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366767
+milestone: '15.7'
 type: development
-group: group::pipeline execution
+group: group::product intelligence
 default_enabled: false
diff --git a/config/feature_flags/development/rpm_packages.yml b/config/feature_flags/development/rpm_packages.yml
index a342f1203f7..2ed00b2cf11 100644
--- a/config/feature_flags/development/rpm_packages.yml
+++ b/config/feature_flags/development/rpm_packages.yml
@@ -4,5 +4,5 @@ introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96019'
 rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/371863'
 milestone: '15.4'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/rubygem_packages.yml b/config/feature_flags/development/rubygem_packages.yml
index 9f394f091bb..3a05251d9b6 100644
--- a/config/feature_flags/development/rubygem_packages.yml
+++ b/config/feature_flags/development/rubygem_packages.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52147
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299383
 milestone: '13.9'
 type: development
-group: group::package
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/scan_execution_rule_mode.yml b/config/feature_flags/development/scan_execution_rule_mode.yml
deleted file mode 100644
index 6e3dd6acf92..00000000000
--- a/config/feature_flags/development/scan_execution_rule_mode.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: scan_execution_rule_mode
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359883
-milestone: '15.2'
-type: development
-group: group::container security
-default_enabled: true
diff --git a/config/feature_flags/development/automated_email_provision.yml b/config/feature_flags/development/scan_execution_tags.yml
index 2734413dd8f..bd9412a4e9c 100644
--- a/config/feature_flags/development/automated_email_provision.yml
+++ b/config/feature_flags/development/scan_execution_tags.yml
@@ -1,8 +1,8 @@
 ---
-name: automated_email_provision
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75872
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348317
-milestone: '14.6'
+name: scan_execution_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104954
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385169
+milestone: '15.7'
 type: development
-group: group::license
+group: group::security policies
 default_enabled: true
diff --git a/config/feature_flags/development/schema_linting.yml b/config/feature_flags/development/schema_linting.yml
index 6c1cbdb5248..0abca3e03dc 100644
--- a/config/feature_flags/development/schema_linting.yml
+++ b/config/feature_flags/development/schema_linting.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919
 milestone: '13.2'
 type: development
 group: group::editor
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/search_page_vertical_nav.yml b/config/feature_flags/development/search_page_vertical_nav.yml
index 58088cee802..a0e9d760295 100644
--- a/config/feature_flags/development/search_page_vertical_nav.yml
+++ b/config/feature_flags/development/search_page_vertical_nav.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373613
 milestone: '15.5'
 type: development
 group: group::global search
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/secure_files_metadata_parsers.yml b/config/feature_flags/development/secure_files_metadata_parsers.yml
deleted file mode 100644
index 2d6eed27f4b..00000000000
--- a/config/feature_flags/development/secure_files_metadata_parsers.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: secure_files_metadata_parsers
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99046
-rollout_issue_url:
-milestone: '15.5'
-type: development
-group: group::incubation
-default_enabled: false
diff --git a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
index 820e6cafb41..aa8e243e89e 100644
--- a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
+++ b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66525
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336592
 milestone: '14.2'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/split_operations_visibility_permissions.yml b/config/feature_flags/development/split_operations_visibility_permissions.yml
deleted file mode 100644
index 56955733217..00000000000
--- a/config/feature_flags/development/split_operations_visibility_permissions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: split_operations_visibility_permissions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89089
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364240
-milestone: '15.1'
-type: development
-group: group::respond
-default_enabled: true
diff --git a/config/feature_flags/development/lazy_load_commits.yml b/config/feature_flags/development/ssh_commit_signatures.yml
index 6140b88c3c2..a056ba1a2ba 100644
--- a/config/feature_flags/development/lazy_load_commits.yml
+++ b/config/feature_flags/development/ssh_commit_signatures.yml
@@ -1,8 +1,8 @@
 ---
-name: lazy_load_commits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71633
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342497
-milestone: '14.4'
+name: ssh_commit_signatures
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97248
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350301
+milestone: '15.7'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/subgroups_approval_rules.yml b/config/feature_flags/development/subgroups_approval_rules.yml
deleted file mode 100644
index e7935f5e5d2..00000000000
--- a/config/feature_flags/development/subgroups_approval_rules.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: subgroups_approval_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91598
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366741
-milestone: '15.2'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/super_sidebar_nav.yml b/config/feature_flags/development/super_sidebar_nav.yml
new file mode 100644
index 00000000000..cf088956bc0
--- /dev/null
+++ b/config/feature_flags/development/super_sidebar_nav.yml
@@ -0,0 +1,8 @@
+---
+name: super_sidebar_nav
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101910
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381456
+milestone: '15.7'
+type: development
+group: group::foundations
+default_enabled: false
diff --git a/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml b/config/feature_flags/development/track_and_raise_delete_source_errors.yml
index fb03ff91d0a..5f34ab47f19 100644
--- a/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml
+++ b/config/feature_flags/development/track_and_raise_delete_source_errors.yml
@@ -1,7 +1,7 @@
 ---
-name: check_etags_diffs_batch_before_write_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101421
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378333
+name: track_and_raise_delete_source_errors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103842
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382440
 milestone: '15.6'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/two_factor_for_cli.yml b/config/feature_flags/development/two_factor_for_cli.yml
index e442bb035cf..341f06d9ffa 100644
--- a/config/feature_flags/development/two_factor_for_cli.yml
+++ b/config/feature_flags/development/two_factor_for_cli.yml
@@ -1,8 +1,8 @@
 ---
 name: two_factor_for_cli
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39703
-rollout_issue_url: 
+rollout_issue_url:
 milestone: '13.5'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml b/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml
deleted file mode 100644
index f3a3772972e..00000000000
--- a/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_ci_i_testing_coverage_report_uploaded
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102371
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339721
-milestone: '15.6'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/usage_data_diff_searches.yml b/config/feature_flags/development/usage_data_diff_searches.yml
deleted file mode 100644
index 70c053b7a17..00000000000
--- a/config/feature_flags/development/usage_data_diff_searches.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: usage_data_diff_searches
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86603
-rollout_issue_url:
-milestone: '15.0'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/indifferent_wal_location_keys.yml b/config/feature_flags/development/use_ref_type_parameter.yml
index 2d89ad82085..5cdd3d6f198 100644
--- a/config/feature_flags/development/indifferent_wal_location_keys.yml
+++ b/config/feature_flags/development/use_ref_type_parameter.yml
@@ -1,8 +1,9 @@
 ---
-name: indifferent_wal_location_keys
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101096
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377989
-milestone: '15.5'
+name: use_ref_type_parameter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102936
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381501
+milestone: '15.6'
 type: development
 group: group::source code
 default_enabled: false
+
diff --git a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
index b2262c9707e..3eece0b906a 100644
--- a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78542
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350637
 milestone: '14.8'
 type: development
-group: group::authentication and authorization
+group: group::workspace
 default_enabled: true
diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml
index 098b96e97f0..77ee79fe80a 100644
--- a/config/feature_flags/development/user_time_settings.yml
+++ b/config/feature_flags/development/user_time_settings.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407
 milestone: '11.11'
 type: development
-group: group::access
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml b/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml
deleted file mode 100644
index 0fc30f63047..00000000000
--- a/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: verify_mail_scheduler_notification_service_worker_method_names
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103785
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470
-milestone: '15.6'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/web_hooks_disable_failed.yml b/config/feature_flags/development/web_hooks_disable_failed.yml
deleted file mode 100644
index 3a7c85edafc..00000000000
--- a/config/feature_flags/development/web_hooks_disable_failed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: web_hooks_disable_failed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60837
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329849
-milestone: '13.12'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/web_hooks_no_rate_limit.yml b/config/feature_flags/development/web_hooks_no_rate_limit.yml
deleted file mode 100644
index 387aa8bb007..00000000000
--- a/config/feature_flags/development/web_hooks_no_rate_limit.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: web_hooks_no_rate_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90868
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366084
-milestone: '15.2'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/webauthn.yml b/config/feature_flags/development/webauthn.yml
index 135d4af2465..6bd4fc95020 100644
--- a/config/feature_flags/development/webauthn.yml
+++ b/config/feature_flags/development/webauthn.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26692
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232671
 milestone: '13.4'
 type: development
-group: group::access
+group: group::authentication and authorization
 default_enabled: true
diff --git a/config/feature_flags/development/webhook_form_mask_url.yml b/config/feature_flags/development/webhook_form_mask_url.yml
deleted file mode 100644
index 445fcb0b6b3..00000000000
--- a/config/feature_flags/development/webhook_form_mask_url.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: webhook_form_mask_url
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99995
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376106
-milestone: '15.5'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/webhooks_failed_callout.yml b/config/feature_flags/development/webhooks_failed_callout.yml
deleted file mode 100644
index 11de5a793f6..00000000000
--- a/config/feature_flags/development/webhooks_failed_callout.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: webhooks_failed_callout
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91092
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365535
-milestone: '15.2'
-type: development
-group: group::integrations
-default_enabled: false