Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

77 files changed, 402 insertions, 181 deletions

diff --git a/config/feature_flags/development/add_timing_to_certain_cache_actions.yml b/config/feature_flags/development/add_timing_to_certain_cache_actions.yml
new file mode 100644
index 00000000000..c03e49dae8d
--- /dev/null
+++ b/config/feature_flags/development/add_timing_to_certain_cache_actions.yml
@@ -0,0 +1,8 @@
+---
+name: add_timing_to_certain_cache_actions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94966
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371657
+milestone: '15.4'
+type: development
+group: group::code review
+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
index 233be4d930e..f5ec2473af8 100644
--- a/config/feature_flags/development/always_async_project_authorizations_refresh.yml
+++ b/config/feature_flags/development/always_async_project_authorizations_refresh.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367683
 milestone: '15.3'
 type: development
 group: group::workspace
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/auto_ban_user_on_excessive_projects_download.yml b/config/feature_flags/development/arkose_labs_signup_challenge.yml
index d3883086088..8b40ce5d029 100644
--- a/config/feature_flags/development/auto_ban_user_on_excessive_projects_download.yml
+++ b/config/feature_flags/development/arkose_labs_signup_challenge.yml
@@ -1,8 +1,8 @@
 ---
-name: auto_ban_user_on_excessive_projects_download
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87872
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364782
-milestone: '15.2'
+name: arkose_labs_signup_challenge
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95560
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370932
+milestone: '15.4'
 type: development
 group: group::anti-abuse
 default_enabled: false
diff --git a/config/feature_flags/development/block_emails_with_failures.yml b/config/feature_flags/development/block_emails_with_failures.yml
new file mode 100644
index 00000000000..c06d49346b3
--- /dev/null
+++ b/config/feature_flags/development/block_emails_with_failures.yml
@@ -0,0 +1,8 @@
+---
+name: block_emails_with_failures
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96902
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373159
+milestone: '15.4'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/block_weak_passwords.yml b/config/feature_flags/development/block_weak_passwords.yml
new file mode 100644
index 00000000000..aaa8c2cac38
--- /dev/null
+++ b/config/feature_flags/development/block_weak_passwords.yml
@@ -0,0 +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'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml b/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
new file mode 100644
index 00000000000..4517bd5360e
--- /dev/null
+++ b/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
@@ -0,0 +1,8 @@
+---
+name: bypass_batch_pop_queueing_for_merge_trains
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96793
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372366
+milestone: '15.4'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/seat_count_alerts.yml b/config/feature_flags/development/cache_issue_sums.yml
index 9b2f3a2ef55..7b8bfc44ce2 100644
--- a/config/feature_flags/development/seat_count_alerts.yml
+++ b/config/feature_flags/development/cache_issue_sums.yml
@@ -1,8 +1,8 @@
 ---
-name: seat_count_alerts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89204
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362041
-milestone: '15.1'
+name: cache_issue_sums
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95048
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365940
+milestone: '15.4'
 type: development
-group: group::purchase
+group: group::product planning
 default_enabled: false
diff --git a/config/feature_flags/development/ci_new_public_oss_cost_factor.yml b/config/feature_flags/development/ci_limit_active_jobs_early.yml
index 20ab9bd4509..b7dba0f81e9 100644
--- a/config/feature_flags/development/ci_new_public_oss_cost_factor.yml
+++ b/config/feature_flags/development/ci_limit_active_jobs_early.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_new_public_oss_cost_factor
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93046
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369113
-milestone: '15.3'
+name: ci_limit_active_jobs_early
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97700
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373284
+milestone: '15.4'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml b/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml
new file mode 100644
index 00000000000..ad0dd85a25a
--- /dev/null
+++ b/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml
@@ -0,0 +1,8 @@
+---
+name: ci_limit_complete_hierarchy_size
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95857
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373719
+milestone: '15.4'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ci_variable_for_group_gitlab_deploy_token.yml b/config/feature_flags/development/ci_project_pipeline_config_refactoring.yml
index 155a6c385fc..0338b81caf7 100644
--- a/config/feature_flags/development/ci_variable_for_group_gitlab_deploy_token.yml
+++ b/config/feature_flags/development/ci_project_pipeline_config_refactoring.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_variable_for_group_gitlab_deploy_token
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88696
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363621
-milestone: '15.1'
+name: ci_project_pipeline_config_refactoring
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97240
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372867
+milestone: '15.4'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml b/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
new file mode 100644
index 00000000000..5e27510629c
--- /dev/null
+++ b/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
@@ -0,0 +1,8 @@
+---
+name: ci_requeue_with_dag_object_hierarchy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97156
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373148
+milestone: '15.4'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml b/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml
index e9f378288d9..a78290b65d6 100644
--- a/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml
+++ b/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369907
 milestone: '15.3'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml b/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml
new file mode 100644
index 00000000000..ffcd5352751
--- /dev/null
+++ b/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml
@@ -0,0 +1,8 @@
+---
+name: ci_update_unlocked_pipeline_artifacts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97228
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372835
+milestone: '15.4'
+type: development
+group: group::pipeline insights
+default_enabled: false
diff --git a/config/feature_flags/development/ci_variables_refactoring_to_variable.yml b/config/feature_flags/development/ci_variables_refactoring_to_variable.yml
new file mode 100644
index 00000000000..131df28d104
--- /dev/null
+++ b/config/feature_flags/development/ci_variables_refactoring_to_variable.yml
@@ -0,0 +1,8 @@
+---
+name: ci_variables_refactoring_to_variable
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95390
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371559
+milestone: '15.4'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml b/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml
deleted file mode 100644
index fefc84ed0a0..00000000000
--- a/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: container_registry_legacy_authentication_for_deploy_tokens
-introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2470
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365968
-milestone: '15.1'
-type: development
-group: group::package
-default_enabled: false
diff --git a/config/feature_flags/development/contribution_analytics_optimized_base_query.yml b/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
index 0e8697fb206..05ee44a7ee2 100644
--- a/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
+++ b/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367090
 milestone: '15.2'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/convert_diff_to_utf8_with_replacement_symbol.yml b/config/feature_flags/development/convert_diff_to_utf8_with_replacement_symbol.yml
deleted file mode 100644
index 1d0f64d9ac2..00000000000
--- a/config/feature_flags/development/convert_diff_to_utf8_with_replacement_symbol.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: convert_diff_to_utf8_with_replacement_symbol
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79996
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354526
-milestone: '14.9'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/track_agent_users_using_ci_tunnel.yml b/config/feature_flags/development/cube_api_proxy.yml
index 0a00babc2db..06dcefb1303 100644
--- a/config/feature_flags/development/track_agent_users_using_ci_tunnel.yml
+++ b/config/feature_flags/development/cube_api_proxy.yml
@@ -1,8 +1,8 @@
 ---
-name: track_agent_users_using_ci_tunnel
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92300
+name: cube_api_proxy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96250
 rollout_issue_url:
-milestone: '15.3'
+milestone: '15.4'
 type: development
-group: group::configure
+group: group::product_analytics
 default_enabled: false
diff --git a/config/feature_flags/development/dora_configuration.yml b/config/feature_flags/development/dora_configuration.yml
new file mode 100644
index 00000000000..38a050571d8
--- /dev/null
+++ b/config/feature_flags/development/dora_configuration.yml
@@ -0,0 +1,8 @@
+---
+name: dora_configuration
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96561"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/372545"
+milestone: '15.4'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/improved_mergeability_checks.yml b/config/feature_flags/development/draft_quick_action_non_toggle.yml
index 83450ffa16f..4d28b61f3bf 100644
--- a/config/feature_flags/development/improved_mergeability_checks.yml
+++ b/config/feature_flags/development/draft_quick_action_non_toggle.yml
@@ -1,8 +1,8 @@
 ---
-name: improved_mergeability_checks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68312
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342386
-milestone: '14.4'
+name: draft_quick_action_non_toggle
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368610
+milestone: '15.4'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/epic_widget_edit_confirmation.yml b/config/feature_flags/development/epic_widget_edit_confirmation.yml
new file mode 100644
index 00000000000..6c92ef44e2f
--- /dev/null
+++ b/config/feature_flags/development/epic_widget_edit_confirmation.yml
@@ -0,0 +1,8 @@
+---
+name: epic_widget_edit_confirmation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96872
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372429
+milestone: '15.4'
+type: development
+group: group::product planning
+default_enabled: false
diff --git a/config/feature_flags/development/error_tracking_sentry_limit.yml b/config/feature_flags/development/error_tracking_sentry_limit.yml
new file mode 100644
index 00000000000..75a32fa2114
--- /dev/null
+++ b/config/feature_flags/development/error_tracking_sentry_limit.yml
@@ -0,0 +1,8 @@
+---
+name: error_tracking_sentry_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84209
+rollout_issue_url:  https://gitlab.com/gitlab-org/gitlab/-/issues/372427
+milestone: '15.4'
+type: development
+group: group::observability
+default_enabled: false
diff --git a/config/feature_flags/development/tag_list_keyset_pagination.yml b/config/feature_flags/development/escape_gitaly_refs.yml
index 52c21e22d9f..b42cc4c07e5 100644
--- a/config/feature_flags/development/tag_list_keyset_pagination.yml
+++ b/config/feature_flags/development/escape_gitaly_refs.yml
@@ -1,8 +1,8 @@
 ---
-name: tag_list_keyset_pagination
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74239
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345595
-milestone: '14.5'
+name: escape_gitaly_refs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91058
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366437
+milestone: '15.2'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/group_ip_restrictions_allow_global.yml b/config/feature_flags/development/extract_mr_diff_deletions.yml
index 87cfa5e8b1b..24067f95074 100644
--- a/config/feature_flags/development/group_ip_restrictions_allow_global.yml
+++ b/config/feature_flags/development/extract_mr_diff_deletions.yml
@@ -1,8 +1,8 @@
 ---
-name: group_ip_restrictions_allow_global
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87579
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362603
-milestone: '15.1'
+name: extract_mr_diff_deletions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96455
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372060
+milestone: '15.4'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/api_caching_branches.yml b/config/feature_flags/development/gitlab_shell_jwt_token.yml
index 310d643529e..7cb6da2b49f 100644
--- a/config/feature_flags/development/api_caching_branches.yml
+++ b/config/feature_flags/development/gitlab_shell_jwt_token.yml
@@ -1,8 +1,8 @@
 ---
-name: api_caching_branches
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61157
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330371
-milestone: '13.12'
+name: gitlab_shell_jwt_token
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86148
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360808
+milestone: '15.3'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/global_search_custom_slis.yml b/config/feature_flags/development/global_search_custom_slis.yml
new file mode 100644
index 00000000000..6dd7cfb12f0
--- /dev/null
+++ b/config/feature_flags/development/global_search_custom_slis.yml
@@ -0,0 +1,8 @@
+---
+name: global_search_custom_slis
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95182
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372107
+milestone: '15.4'
+type: development
+group: group::application performance
+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
new file mode 100644
index 00000000000..d1637ad692c
--- /dev/null
+++ b/config/feature_flags/development/global_search_error_rate_sli.yml
@@ -0,0 +1,8 @@
+---
+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/ci_docker_image_pull_policy.yml b/config/feature_flags/development/graphql_job_app.yml
index 5bdcdf03d27..a0f0cb71e17 100644
--- a/config/feature_flags/development/ci_docker_image_pull_policy.yml
+++ b/config/feature_flags/development/graphql_job_app.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_docker_image_pull_policy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85588
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363186
-milestone: '15.1'
+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'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+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
new file mode 100644
index 00000000000..e289ad9af50
--- /dev/null
+++ b/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
@@ -0,0 +1,8 @@
+---
+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: false
diff --git a/config/feature_flags/development/group_level_protected_environment_settings_permission.yml b/config/feature_flags/development/group_level_protected_environment_settings_permission.yml
deleted file mode 100644
index bbcfe24ba72..00000000000
--- a/config/feature_flags/development/group_level_protected_environment_settings_permission.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_level_protected_environment_settings_permission
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92801
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369873
-milestone: '15.3'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/group_overview_tabs_vue.yml b/config/feature_flags/development/group_overview_tabs_vue.yml
new file mode 100644
index 00000000000..4c54ab31b53
--- /dev/null
+++ b/config/feature_flags/development/group_overview_tabs_vue.yml
@@ -0,0 +1,8 @@
+---
+name: group_overview_tabs_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95850
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370872
+milestone: '15.4'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/hash_oauth_secrets.yml b/config/feature_flags/development/hash_oauth_secrets.yml
new file mode 100644
index 00000000000..7730d319bab
--- /dev/null
+++ b/config/feature_flags/development/hash_oauth_secrets.yml
@@ -0,0 +1,8 @@
+---
+name: hash_oauth_secrets
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96252
+rollout_issue_url: 
+milestone: '15.4'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/highlight_diffs_renewable_expiration.yml b/config/feature_flags/development/highlight_diffs_renewable_expiration.yml
new file mode 100644
index 00000000000..80635b96240
--- /dev/null
+++ b/config/feature_flags/development/highlight_diffs_renewable_expiration.yml
@@ -0,0 +1,8 @@
+---
+name: highlight_diffs_renewable_expiration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95356
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370728
+milestone: '15.3'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml b/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml
new file mode 100644
index 00000000000..1f20678b4a6
--- /dev/null
+++ b/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml
@@ -0,0 +1,8 @@
+---
+name: highlight_diffs_short_renewable_expiration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95356
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370728
+milestone: '15.3'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/include_groups_from_group_shares_in_project_transfer_locations.yml b/config/feature_flags/development/include_groups_from_group_shares_in_group_transfer_locations.yml
index 3db60cfd2d7..f92a6b2b1b0 100644
--- a/config/feature_flags/development/include_groups_from_group_shares_in_project_transfer_locations.yml
+++ b/config/feature_flags/development/include_groups_from_group_shares_in_group_transfer_locations.yml
@@ -1,8 +1,8 @@
 ---
-name: include_groups_from_group_shares_in_project_transfer_locations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90127
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366305
-milestone: '15.2'
+name: include_groups_from_group_shares_in_group_transfer_locations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96347
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371961
+milestone: '15.4'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/incubation_5mp_google_cloud.yml b/config/feature_flags/development/incubation_5mp_google_cloud.yml
index b687a656b40..1b3ba503f5d 100644
--- a/config/feature_flags/development/incubation_5mp_google_cloud.yml
+++ b/config/feature_flags/development/incubation_5mp_google_cloud.yml
@@ -1,7 +1,7 @@
 ---
 name: incubation_5mp_google_cloud
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70715
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371332
 milestone: '14.3'
 type: development
 group: group::incubation
diff --git a/config/feature_flags/development/invitation_flow_enforcement_setting.yml b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
new file mode 100644
index 00000000000..39da6c40bed
--- /dev/null
+++ b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
@@ -0,0 +1,8 @@
+---
+name: invitation_flow_enforcement_setting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92218
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367666
+milestone: '15.4'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/rebalance_issues.yml b/config/feature_flags/development/markdown_dollar_math.yml
index 5651b02b073..842837ea688 100644
--- a/config/feature_flags/development/rebalance_issues.yml
+++ b/config/feature_flags/development/markdown_dollar_math.yml
@@ -1,8 +1,8 @@
 ---
-name: rebalance_issues
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40124
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239344
-milestone: '13.4'
+name: markdown_dollar_math
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94111
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371180
+milestone: '15.4'
 type: development
 group: group::project management
-default_enabled: true
+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
new file mode 100644
index 00000000000..756a931b3a1
--- /dev/null
+++ b/config/feature_flags/development/maven_central_request_forwarding.yml
@@ -0,0 +1,8 @@
+---
+name: maven_central_request_forwarding
+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
+default_enabled: false
diff --git a/config/feature_flags/development/async_after_approval.yml b/config/feature_flags/development/mergeability_checks_logger.yml
index db53454b88f..3476d6f2133 100644
--- a/config/feature_flags/development/async_after_approval.yml
+++ b/config/feature_flags/development/mergeability_checks_logger.yml
@@ -1,8 +1,8 @@
 ---
-name: async_after_approval
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92520
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368098
-milestone: '15.3'
+name: mergeability_checks_logger
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96128
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371717
+milestone: '15.4'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/ml_experiment_tracking.yml b/config/feature_flags/development/ml_experiment_tracking.yml
new file mode 100644
index 00000000000..2749cbc3fc1
--- /dev/null
+++ b/config/feature_flags/development/ml_experiment_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: ml_experiment_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95689
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371669
+milestone: '15.4'
+type: development
+group: group::incubation
+default_enabled: false
diff --git a/config/feature_flags/development/s3_omit_multipart_urls.yml b/config/feature_flags/development/new_navbar_layout.yml
index 92d30601739..2d212922fcc 100644
--- a/config/feature_flags/development/s3_omit_multipart_urls.yml
+++ b/config/feature_flags/development/new_navbar_layout.yml
@@ -1,8 +1,8 @@
 ---
-name: s3_omit_multipart_urls
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85306
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359718
-milestone: '14.10'
+name: new_navbar_layout
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96853
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373078
+milestone: '15.4'
 type: development
-group: group::package
+group: group::foundations
 default_enabled: true
diff --git a/config/feature_flags/development/observability_group_tab.yml b/config/feature_flags/development/observability_group_tab.yml
new file mode 100644
index 00000000000..b588a74e7d0
--- /dev/null
+++ b/config/feature_flags/development/observability_group_tab.yml
@@ -0,0 +1,8 @@
+---
+name: observability_group_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96374
+rollout_issue_url: 
+milestone: '15.3'
+type: development
+group: group::observability
+default_enabled: false
diff --git a/config/feature_flags/development/order_builds_for_group_runner.yml b/config/feature_flags/development/order_builds_for_group_runner.yml
new file mode 100644
index 00000000000..50f9a301ad6
--- /dev/null
+++ b/config/feature_flags/development/order_builds_for_group_runner.yml
@@ -0,0 +1,8 @@
+---
+name: order_builds_for_group_runner
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94815
+rollout_issue_url: 
+milestone: '15.4'
+type: development
+group: group::pipeline execution
+default_enabled: true
diff --git a/config/feature_flags/development/prevent_outdated_deployment_jobs.yml b/config/feature_flags/development/prevent_outdated_deployment_jobs.yml
new file mode 100644
index 00000000000..5b92874dfd7
--- /dev/null
+++ b/config/feature_flags/development/prevent_outdated_deployment_jobs.yml
@@ -0,0 +1,8 @@
+---
+name: prevent_outdated_deployment_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97171
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370628
+milestone: '15.4'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/process_issue_closure_in_background.yml b/config/feature_flags/development/process_issue_closure_in_background.yml
new file mode 100644
index 00000000000..6a97cbf888e
--- /dev/null
+++ b/config/feature_flags/development/process_issue_closure_in_background.yml
@@ -0,0 +1,8 @@
+---
+name: process_issue_closure_in_background
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94981
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371024
+milestone: '15.4'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/product_intelligence_database_event_tracking.yml b/config/feature_flags/development/product_intelligence_database_event_tracking.yml
index 83a65398e87..545cdc47f2b 100644
--- a/config/feature_flags/development/product_intelligence_database_event_tracking.yml
+++ b/config/feature_flags/development/product_intelligence_database_event_tracking.yml
@@ -2,7 +2,6 @@
 name: product_intelligence_database_event_tracking
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92079
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368976
-rollout_issue_url:
 milestone: '15.3'
 type: development
 group: group::product intelligence
diff --git a/config/feature_flags/development/shimo_integration.yml b/config/feature_flags/development/read_package_policy_rule.yml
index 28c0a7859bc..151c5a8c0b5 100644
--- a/config/feature_flags/development/shimo_integration.yml
+++ b/config/feature_flags/development/read_package_policy_rule.yml
@@ -1,8 +1,8 @@
 ---
-name: shimo_integration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73129
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345356
-milestone: '14.5'
+name: read_package_policy_rule
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90963
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366711
+milestone: '15.4'
 type: development
-group: group::integrations
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/rely_on_protected_branches_cache.yml b/config/feature_flags/development/rely_on_protected_branches_cache.yml
new file mode 100644
index 00000000000..5154d4cee08
--- /dev/null
+++ b/config/feature_flags/development/rely_on_protected_branches_cache.yml
@@ -0,0 +1,8 @@
+---
+name: rely_on_protected_branches_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92937
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370608
+milestone: '15.4'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/datadog_integration_logs_collection.yml b/config/feature_flags/development/remove_extra_primary_submenu_options.yml
index 3e65b70d0e6..dda22c5d57e 100644
--- a/config/feature_flags/development/datadog_integration_logs_collection.yml
+++ b/config/feature_flags/development/remove_extra_primary_submenu_options.yml
@@ -1,8 +1,8 @@
 ---
-name: datadog_integration_logs_collection
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74725
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346339
-milestone: '14.8'
+name: remove_extra_primary_submenu_options
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96931
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373078
+milestone: '15.4'
 type: development
-group: group::integrations
+group: group::foundations
 default_enabled: true
diff --git a/config/feature_flags/development/mr_attention_requests.yml b/config/feature_flags/development/remove_user_attributes_groups.yml
index b80300d1acf..069d83455f9 100644
--- a/config/feature_flags/development/mr_attention_requests.yml
+++ b/config/feature_flags/development/remove_user_attributes_groups.yml
@@ -1,8 +1,8 @@
 ---
-name: mr_attention_requests
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72773
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343528
-milestone: '14.4'
+name: remove_user_attributes_groups
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
+milestone: '15.4'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/etag_merge_request_diff_batches.yml b/config/feature_flags/development/remove_user_attributes_projects.yml
index 8cd3ba8637a..fc1beb42a73 100644
--- a/config/feature_flags/development/etag_merge_request_diff_batches.yml
+++ b/config/feature_flags/development/remove_user_attributes_projects.yml
@@ -1,8 +1,8 @@
 ---
-name: etag_merge_request_diff_batches
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93953
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369488
-milestone: '15.3'
+name: remove_user_attributes_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
+milestone: '15.4'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/report_artifact_build_completed_metrics_on_build_completion.yml b/config/feature_flags/development/report_artifact_build_completed_metrics_on_build_completion.yml
deleted file mode 100644
index 76b6c8c6b2f..00000000000
--- a/config/feature_flags/development/report_artifact_build_completed_metrics_on_build_completion.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: report_artifact_build_completed_metrics_on_build_completion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80334
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369500
-milestone: '15.3'
-type: development
-group: group::static analysis
-default_enabled: false
diff --git a/config/feature_flags/development/restyle_login_page.yml b/config/feature_flags/development/restyle_login_page.yml
index ed3ae3ef6ea..bfe99590e6e 100644
--- a/config/feature_flags/development/restyle_login_page.yml
+++ b/config/feature_flags/development/restyle_login_page.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368387
 milestone: '15.2'
 type: development
 group: group::authentication and authorization
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/rpm_packages.yml b/config/feature_flags/development/rpm_packages.yml
new file mode 100644
index 00000000000..a342f1203f7
--- /dev/null
+++ b/config/feature_flags/development/rpm_packages.yml
@@ -0,0 +1,8 @@
+---
+name: rpm_packages
+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
+default_enabled: false
diff --git a/config/feature_flags/development/execute_build_hooks_inline.yml b/config/feature_flags/development/run_pipeline_graphql.yml
index 0389fca3bb1..78d8afbbee5 100644
--- a/config/feature_flags/development/execute_build_hooks_inline.yml
+++ b/config/feature_flags/development/run_pipeline_graphql.yml
@@ -1,8 +1,8 @@
 ---
-name: execute_build_hooks_inline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93665
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370387
-milestone: '15.3'
+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'
 type: development
-group: group::integrations
+group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/skip_checking_namespace_in_query.yml b/config/feature_flags/development/skip_checking_namespace_in_query.yml
new file mode 100644
index 00000000000..2b9e3cbfe0b
--- /dev/null
+++ b/config/feature_flags/development/skip_checking_namespace_in_query.yml
@@ -0,0 +1,8 @@
+---
+name: skip_checking_namespace_in_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96559
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370742
+milestone: '15.4'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/track_work_items_activity.yml b/config/feature_flags/development/track_work_items_activity.yml
index e4614f2d5e2..3727bca1078 100644
--- a/config/feature_flags/development/track_work_items_activity.yml
+++ b/config/feature_flags/development/track_work_items_activity.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352903
 milestone: '14.9'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ultimate_feature_removal_banner.yml b/config/feature_flags/development/ultimate_feature_removal_banner.yml
new file mode 100644
index 00000000000..14d7b4921c1
--- /dev/null
+++ b/config/feature_flags/development/ultimate_feature_removal_banner.yml
@@ -0,0 +1,8 @@
+---
+name: ultimate_feature_removal_banner
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94271
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371690
+milestone: '15.4'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml b/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml
new file mode 100644
index 00000000000..1635427485b
--- /dev/null
+++ b/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_ci_i_testing_test_report_uploaded
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95112
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339720
+milestone: '15.4'
+type: development
+group: group::pipeline insights
+default_enabled: false
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_gitlab_cli_api_request.yml b/config/feature_flags/development/usage_data_i_code_review_user_gitlab_cli_api_request.yml
deleted file mode 100644
index 898c19a34a9..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_gitlab_cli_api_request.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_gitlab_cli_api_request
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83464
-rollout_issue_url:
-milestone: '14.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_jetbrains_api_request.yml b/config/feature_flags/development/usage_data_i_code_review_user_jetbrains_api_request.yml
deleted file mode 100644
index 3ab01c78a28..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_jetbrains_api_request.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_jetbrains_api_request
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78713
-rollout_issue_url:
-milestone: '14.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_quotas_for_all_editions.yml b/config/feature_flags/development/usage_quotas_for_all_editions.yml
new file mode 100644
index 00000000000..d4e4116542a
--- /dev/null
+++ b/config/feature_flags/development/usage_quotas_for_all_editions.yml
@@ -0,0 +1,8 @@
+---
+name: usage_quotas_for_all_editions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96063
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371639
+milestone: '15.4'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/use_gitaly_pagination_for_refs.yml b/config/feature_flags/development/use_gitaly_pagination_for_refs.yml
new file mode 100644
index 00000000000..f44233e8d0b
--- /dev/null
+++ b/config/feature_flags/development/use_gitaly_pagination_for_refs.yml
@@ -0,0 +1,8 @@
+---
+name: use_gitaly_pagination_for_refs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96448
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372049
+milestone: '15.4'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/development/use_pipeline_wizard_for_pages.yml b/config/feature_flags/development/use_pipeline_wizard_for_pages.yml
index 10d4478934e..2de1b952f95 100644
--- a/config/feature_flags/development/use_pipeline_wizard_for_pages.yml
+++ b/config/feature_flags/development/use_pipeline_wizard_for_pages.yml
@@ -2,7 +2,7 @@
 name: use_pipeline_wizard_for_pages
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78276
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349095
-milestone: '15.3'
+milestone: '15.4'
 type: development
 group: group::incubation
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/use_vsa_aggregated_tables.yml b/config/feature_flags/development/use_vsa_aggregated_tables.yml
deleted file mode 100644
index 89c24181eb1..00000000000
--- a/config/feature_flags/development/use_vsa_aggregated_tables.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_vsa_aggregated_tables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72978
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343429
-milestone: '14.5'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/auto_ban_user_on_namespace_excessive_projects_download.yml b/config/feature_flags/development/user_destroy_with_limited_execution_time_worker.yml
index 6e14a8dd62c..9eacfc019ac 100644
--- a/config/feature_flags/development/auto_ban_user_on_namespace_excessive_projects_download.yml
+++ b/config/feature_flags/development/user_destroy_with_limited_execution_time_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: auto_ban_user_on_namespace_excessive_projects_download
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91343
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367611
-milestone: '15.3'
+name: user_destroy_with_limited_execution_time_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97141
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373138
+milestone: '15.4'
 type: development
-group: group::anti-abuse
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/traversal_ids_btree.yml b/config/feature_flags/development/vscode_web_ide.yml
index aaecafe04ae..3d29ae40e7c 100644
--- a/config/feature_flags/development/traversal_ids_btree.yml
+++ b/config/feature_flags/development/vscode_web_ide.yml
@@ -1,8 +1,8 @@
 ---
-name: traversal_ids_btree
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69535
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342871
-milestone: '14.5'
+name: vscode_web_ide
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95169
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371084
+milestone: '15.4'
 type: development
-group: group::access
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/inactive_projects_deletion.yml b/config/feature_flags/development/webui_members_inherited_users.yml
index e9bb91f62cc..14704fd8341 100644
--- a/config/feature_flags/development/inactive_projects_deletion.yml
+++ b/config/feature_flags/development/webui_members_inherited_users.yml
@@ -1,8 +1,8 @@
 ---
-name: inactive_projects_deletion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357968
-milestone: '15.0'
+name: webui_members_inherited_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83214
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364078
+milestone: '15.4'
 type: development
-group: group::compliance
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/wiki_find_page_with_normal_repository_rpcs.yml b/config/feature_flags/development/wiki_find_page_with_normal_repository_rpcs.yml
new file mode 100644
index 00000000000..bad0578d50a
--- /dev/null
+++ b/config/feature_flags/development/wiki_find_page_with_normal_repository_rpcs.yml
@@ -0,0 +1,8 @@
+---
+name: wiki_find_page_with_normal_repository_rpcs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95897
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371487
+milestone: '15.4'
+type: development
+group: group::gitaly
+default_enabled: false
diff --git a/config/feature_flags/experiment/combined_registration.yml b/config/feature_flags/experiment/combined_registration.yml
deleted file mode 100644
index 0b867353946..00000000000
--- a/config/feature_flags/experiment/combined_registration.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: combined_registration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67614
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285533
-milestone: '14.3'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/ops/database_async_index_destruction.yml b/config/feature_flags/ops/ci_partitioning_analyze_queries.yml
index a100b3a40f2..59ca52278e9 100644
--- a/config/feature_flags/ops/database_async_index_destruction.yml
+++ b/config/feature_flags/ops/ci_partitioning_analyze_queries.yml
@@ -1,8 +1,8 @@
 ---
-name: database_async_index_destruction
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92328
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367964
-milestone: '15.3'
+name: ci_partitioning_analyze_queries
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97113
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372840
+milestone: '15.4'
 type: ops
-group: group::database
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/detect_cross_database_modification.yml b/config/feature_flags/ops/detect_cross_database_modification.yml
index 7f74e136291..5f496118c4b 100644
--- a/config/feature_flags/development/detect_cross_database_modification.yml
+++ b/config/feature_flags/ops/detect_cross_database_modification.yml
@@ -1,8 +1,7 @@
 ---
 name: detect_cross_database_modification
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73316
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344620
 milestone: '14.5'
-type: development
+type: ops
 group: group::sharding
 default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_attachments_import.yml b/config/feature_flags/ops/github_importer_attachments_import.yml
new file mode 100644
index 00000000000..ec4fe144933
--- /dev/null
+++ b/config/feature_flags/ops/github_importer_attachments_import.yml
@@ -0,0 +1,8 @@
+---
+name: github_importer_attachments_import
+introduced_by_url:
+rollout_issue_url:
+milestone: '15.4'
+type: ops
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/ops/increase_branch_cache_expiry.yml b/config/feature_flags/ops/increase_branch_cache_expiry.yml
new file mode 100644
index 00000000000..61b9d5b9c42
--- /dev/null
+++ b/config/feature_flags/ops/increase_branch_cache_expiry.yml
@@ -0,0 +1,8 @@
+---
+name: increase_branch_cache_expiry
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96739
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372331
+milestone: '15.4'
+type: ops
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/query_analyzer_gitlab_schema_metrics.yml b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
index b784105368c..9793eebb014 100644
--- a/config/feature_flags/development/query_analyzer_gitlab_schema_metrics.yml
+++ b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
@@ -1,8 +1,7 @@
 ---
 name: query_analyzer_gitlab_schema_metrics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73839
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345034
 milestone: '14.5'
-type: development
+type: ops
 group: group::sharding
 default_enabled: false
diff --git a/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml b/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml
new file mode 100644
index 00000000000..c82f8ee26b7
--- /dev/null
+++ b/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml
@@ -0,0 +1,8 @@
+---
+name: gitaly_simplify_find_local_branches_response
+introduced_by_url: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4850
+rollout_issue_url: https://gitlab.com/gitlab-org/gitaly/-/issues/4452
+milestone: '15.4'
+type: undefined
+group: group::gitaly
+default_enabled: false