Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

47 files changed, 169 insertions, 193 deletions

diff --git a/config/feature_flags/development/markdown_dollar_math.yml b/config/feature_flags/development/achievements.yml
index 842837ea688..853a8133351 100644
--- a/config/feature_flags/development/markdown_dollar_math.yml
+++ b/config/feature_flags/development/achievements.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: achievements
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106909
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386817
+milestone: '15.8'
 type: development
-group: group::project management
+group: group::organization
 default_enabled: false
diff --git a/config/feature_flags/development/bulk_update_membership_roles.yml b/config/feature_flags/development/admin_emails_vue.yml
index 701f72db3e1..63fe56e089f 100644
--- a/config/feature_flags/development/bulk_update_membership_roles.yml
+++ b/config/feature_flags/development/admin_emails_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: bulk_update_membership_roles
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96745
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373257
-milestone: '15.6'
+name: admin_emails_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106358
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386976
+milestone: '15.8'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/use_api_for_payment_validation.yml b/config/feature_flags/development/apple_app_store_integration.yml
index f57df08a2b0..ec55f1ef932 100644
--- a/config/feature_flags/development/use_api_for_payment_validation.yml
+++ b/config/feature_flags/development/apple_app_store_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: use_api_for_payment_validation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84292
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357282
-milestone: '14.10'
+name: apple_app_store_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104888
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385335
+milestone: '15.8'
 type: development
-group: group::purchase
+group: group::incubation
 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
deleted file mode 100644
index 0b6fc6022f4..00000000000
--- a/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_raw_variables_in_yaml_config
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98420
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375034
-milestone: '15.6'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml b/config/feature_flags/development/ci_use_run_pipeline_schedule_worker.yml
index 8b880772d78..27ab6e221a3 100644
--- a/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml
+++ b/config/feature_flags/development/ci_use_run_pipeline_schedule_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_pipeline_triggers_settings_vue_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41864
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247486
-milestone: '13.5'
+name: ci_use_run_pipeline_schedule_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106661
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378361
+milestone: '15.8'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_gitlab_shell.yml b/config/feature_flags/development/commit_search_trailing_spaces.yml
index 3c29a71af6e..b4d2f911620 100644
--- a/config/feature_flags/development/rate_limit_gitlab_shell.yml
+++ b/config/feature_flags/development/commit_search_trailing_spaces.yml
@@ -1,8 +1,8 @@
 ---
-name: rate_limit_gitlab_shell
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78373
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350465
-milestone: '14.7'
+name: commit_search_trailing_spaces
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107956
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386825
+milestone: '15.8'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/critical_security_alert.yml b/config/feature_flags/development/critical_security_alert.yml
new file mode 100644
index 00000000000..6bb5100efc8
--- /dev/null
+++ b/config/feature_flags/development/critical_security_alert.yml
@@ -0,0 +1,8 @@
+---
+name: critical_security_alert
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108732
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387719
+milestone: '15.8'
+type: development
+group: group::distribution
+default_enabled: false
diff --git a/config/feature_flags/development/dispensable_render.yml b/config/feature_flags/development/dispensable_render.yml
deleted file mode 100644
index 6f1689b325a..00000000000
--- a/config/feature_flags/development/dispensable_render.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dispensable_render
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81546
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354337
-milestone: '14.9'
-type: development
-group: group::activation
-default_enabled: true
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
deleted file mode 100644
index 71146d9236b..00000000000
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: display_merge_conflicts_in_diff
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918
-milestone: '13.5'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/environment_search_api_min_chars.yml b/config/feature_flags/development/environment_search_api_min_chars.yml
new file mode 100644
index 00000000000..2d719a41cd0
--- /dev/null
+++ b/config/feature_flags/development/environment_search_api_min_chars.yml
@@ -0,0 +1,8 @@
+---
+name: environment_search_api_min_chars
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108277
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387244
+milestone: '15.8'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/prevent_outdated_deployment_jobs.yml b/config/feature_flags/development/environments_search_logging.yml
index 5b92874dfd7..76f6c78154b 100644
--- a/config/feature_flags/development/prevent_outdated_deployment_jobs.yml
+++ b/config/feature_flags/development/environments_search_logging.yml
@@ -1,8 +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'
+name: environments_search_logging
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107866
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386778
+milestone: '15.8'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/file_line_blame.yml b/config/feature_flags/development/file_line_blame.yml
index 1be6aeee40a..f763d436041 100644
--- a/config/feature_flags/development/file_line_blame.yml
+++ b/config/feature_flags/development/file_line_blame.yml
@@ -1,7 +1,7 @@
 ---
 name: file_line_blame
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92538
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370818
 milestone: '15.3'
 type: development
 group: group::source code
diff --git a/config/feature_flags/development/bulk_import.yml b/config/feature_flags/development/github_import_gists.yml
index 5a654b3f6d9..8e6e5825362 100644
--- a/config/feature_flags/development/bulk_import.yml
+++ b/config/feature_flags/development/github_import_gists.yml
@@ -1,8 +1,8 @@
 ---
-name: bulk_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42704
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255310
-milestone: '13.5'
+name: github_import_gists
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107651
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386579
+milestone: '15.8'
 type: development
 group: group::import
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/group_export_ndjson.yml b/config/feature_flags/development/group_export_ndjson.yml
deleted file mode 100644
index 0f6cc863022..00000000000
--- a/config/feature_flags/development/group_export_ndjson.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_export_ndjson
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29590
-rollout_issue_url: 
-milestone: '13.0'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/group_import_ndjson.yml b/config/feature_flags/development/group_import_ndjson.yml
deleted file mode 100644
index a84df7e0074..00000000000
--- a/config/feature_flags/development/group_import_ndjson.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_import_ndjson
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29716
-rollout_issue_url: 
-milestone: '13.0'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/hide_merge_requests_from_banned_users.yml b/config/feature_flags/development/hide_merge_requests_from_banned_users.yml
new file mode 100644
index 00000000000..6ba0bc24196
--- /dev/null
+++ b/config/feature_flags/development/hide_merge_requests_from_banned_users.yml
@@ -0,0 +1,8 @@
+---
+name: hide_merge_requests_from_banned_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107836
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386726
+milestone: "15.8"
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/incident_event_tags.yml b/config/feature_flags/development/incident_event_tags.yml
new file mode 100644
index 00000000000..68101b21569
--- /dev/null
+++ b/config/feature_flags/development/incident_event_tags.yml
@@ -0,0 +1,8 @@
+---
+name: incident_event_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107194
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387647
+milestone: '15.8'
+type: development
+group: group::respond
+default_enabled: false
diff --git a/config/feature_flags/development/limit_assigned_issues_count.yml b/config/feature_flags/development/issue_type_uses_work_item_types_table.yml
index 7fb58220f26..4ce66b7ab33 100644
--- a/config/feature_flags/development/limit_assigned_issues_count.yml
+++ b/config/feature_flags/development/issue_type_uses_work_item_types_table.yml
@@ -1,8 +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'
+name: issue_type_uses_work_item_types_table
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107690
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386603
+milestone: '15.8'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_oauth_self_managed.yml b/config/feature_flags/development/jira_connect_oauth_self_managed.yml
index dd7a8b6cd29..02c4b9fa398 100644
--- a/config/feature_flags/development/jira_connect_oauth_self_managed.yml
+++ b/config/feature_flags/development/jira_connect_oauth_self_managed.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359940
 milestone: '15.0'
 type: development
 group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/cache_project_integrations.yml b/config/feature_flags/development/jobs_api_keyset_pagination.yml
index 3bb652d4b51..d97b324f97a 100644
--- a/config/feature_flags/development/cache_project_integrations.yml
+++ b/config/feature_flags/development/jobs_api_keyset_pagination.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: jobs_api_keyset_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107152
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385940
+milestone: '15.8'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_build_partition_id_token_prefix.yml b/config/feature_flags/development/move_create_deployments_to_worker.yml
index 5b3cd22a489..e428a7510de 100644
--- a/config/feature_flags/development/ci_build_partition_id_token_prefix.yml
+++ b/config/feature_flags/development/move_create_deployments_to_worker.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: move_create_deployments_to_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108042
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386903
+milestone: '15.8'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/new_fonts.yml b/config/feature_flags/development/new_fonts.yml
index 20bf283e704..43d22a34bc7 100644
--- a/config/feature_flags/development/new_fonts.yml
+++ b/config/feature_flags/development/new_fonts.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379147
 milestone: '15.7'
 type: development
 group: group::foundations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/optimized_housekeeping.yml b/config/feature_flags/development/optimized_housekeeping.yml
deleted file mode 100644
index 478d5ee22e7..00000000000
--- a/config/feature_flags/development/optimized_housekeeping.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: optimized_housekeeping
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81465
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353607
-milestone: '14.9'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/paginated_mr_discussions.yml b/config/feature_flags/development/paginated_mr_discussions.yml
deleted file mode 100644
index d72189d447b..00000000000
--- a/config/feature_flags/development/paginated_mr_discussions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: paginated_mr_discussions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88905
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364497
-milestone: '15.1'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/phabricator_import.yml b/config/feature_flags/development/phabricator_import.yml
deleted file mode 100644
index 5340caef140..00000000000
--- a/config/feature_flags/development/phabricator_import.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: phabricator_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13569
-rollout_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/1197
-milestone: '12.0'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/pipeline_name.yml b/config/feature_flags/development/pipeline_name.yml
deleted file mode 100644
index 9070e754fff..00000000000
--- a/config/feature_flags/development/pipeline_name.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_name
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97502
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376095
-milestone: '15.5'
-type: development
-group: group::delivery
-default_enabled: true
diff --git a/config/feature_flags/development/project_members_index_by_project_namespace.yml b/config/feature_flags/development/project_members_index_by_project_namespace.yml
new file mode 100644
index 00000000000..17a532a5a59
--- /dev/null
+++ b/config/feature_flags/development/project_members_index_by_project_namespace.yml
@@ -0,0 +1,8 @@
+---
+name: project_members_index_by_project_namespace
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105781
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384521
+milestone: '15.7'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/project_runners_vue_ui.yml b/config/feature_flags/development/project_runners_vue_ui.yml
new file mode 100644
index 00000000000..a628b1a4ac3
--- /dev/null
+++ b/config/feature_flags/development/project_runners_vue_ui.yml
@@ -0,0 +1,8 @@
+---
+name: project_runners_vue_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107646
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386573
+milestone: '15.8'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/ci_refactoring_external_mapper.yml b/config/feature_flags/development/project_statistics_bulk_increment.yml
index 22933d253d4..6e8b9083a4d 100644
--- a/config/feature_flags/development/ci_refactoring_external_mapper.yml
+++ b/config/feature_flags/development/project_statistics_bulk_increment.yml
@@ -1,8 +1,8 @@
 ---
-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
+name: project_statistics_bulk_increment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103879
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385845
 milestone: '15.7'
 type: development
-group: group::pipeline authoring
+group: group::pipeline insights
 default_enabled: false
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
deleted file mode 100644
index 667c0db7ee0..00000000000
--- a/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rate_limit_gitlab_shell_by_ip
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91599
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367998
-milestone: '15.3'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/rate_limit_issuable_searches.yml b/config/feature_flags/development/rate_limit_issuable_searches.yml
new file mode 100644
index 00000000000..9a4909da72e
--- /dev/null
+++ b/config/feature_flags/development/rate_limit_issuable_searches.yml
@@ -0,0 +1,8 @@
+---
+name: rate_limit_issuable_searches
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104208"
+rollout_issue_url:
+milestone: '15.8'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/delay_for_repository_update_mirror.yml b/config/feature_flags/development/readme_from_gitaly.yml
index c736036beb5..6e440e928f1 100644
--- a/config/feature_flags/development/delay_for_repository_update_mirror.yml
+++ b/config/feature_flags/development/readme_from_gitaly.yml
@@ -1,8 +1,8 @@
 ---
-name: delay_for_repository_update_mirror
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90749
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365948
-milestone: '15.2'
+name: readme_from_gitaly
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108609
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387703
+milestone: '15.8'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/remove_job_token_on_completion.yml b/config/feature_flags/development/remove_job_token_on_completion.yml
new file mode 100644
index 00000000000..4ab5ffc27ee
--- /dev/null
+++ b/config/feature_flags/development/remove_job_token_on_completion.yml
@@ -0,0 +1,8 @@
+---
+name: remove_job_token_on_completion
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108021
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386871
+milestone: '15.8'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/repository_archive_hotlinking_interception.yml b/config/feature_flags/development/repository_archive_hotlinking_interception.yml
deleted file mode 100644
index dbdde4993f8..00000000000
--- a/config/feature_flags/development/repository_archive_hotlinking_interception.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: repository_archive_hotlinking_interception
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/50c11f278d18fe1f3fb12eb595067216bb58ade2
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369433
-milestone: '12.10'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/track_and_raise_delete_source_errors.yml b/config/feature_flags/development/reset_merge_error_on_transition.yml
index 5f34ab47f19..bb0b25d1666 100644
--- a/config/feature_flags/development/track_and_raise_delete_source_errors.yml
+++ b/config/feature_flags/development/reset_merge_error_on_transition.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: reset_merge_error_on_transition
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106942
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385859
+milestone: '15.8'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/schema_linting.yml b/config/feature_flags/development/schema_linting.yml
deleted file mode 100644
index 0abca3e03dc..00000000000
--- a/config/feature_flags/development/schema_linting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: schema_linting
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35838
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919
-milestone: '13.2'
-type: development
-group: group::editor
-default_enabled: true
diff --git a/config/feature_flags/development/update_vuln_identifiers_flag.yml b/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml
index 3e0e7f4fa41..1f26ffb28ae 100644
--- a/config/feature_flags/development/update_vuln_identifiers_flag.yml
+++ b/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml
@@ -1,8 +1,8 @@
 ---
-name: update_vuln_identifiers_flag
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82538
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362179
-milestone: '15.1'
+name: sec_mark_dropped_findings_as_resolved_scheduler
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108486
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387577
+milestone: '15.8'
 type: development
 group: group::static analysis
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
index 503e676d4ab..2299b33db84 100644
--- a/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml
+++ b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: service_desk_new_note_email_native_attachments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107887
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386860
+milestone: '15.8'
 type: development
-group: group::pipeline authoring
+group: group::respond
 default_enabled: false
diff --git a/config/feature_flags/development/skip_notes_diff_include.yml b/config/feature_flags/development/skip_notes_diff_include.yml
new file mode 100644
index 00000000000..886b1d47e81
--- /dev/null
+++ b/config/feature_flags/development/skip_notes_diff_include.yml
@@ -0,0 +1,8 @@
+---
+name: skip_notes_diff_include
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108893
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388081
+milestone: '15.8'
+type: development
+group: group::product planning
+default_enabled: false
diff --git a/config/feature_flags/development/ssh_commit_signatures.yml b/config/feature_flags/development/ssh_commit_signatures.yml
deleted file mode 100644
index a056ba1a2ba..00000000000
--- a/config/feature_flags/development/ssh_commit_signatures.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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/support_group_level_merge_checks_setting.yml b/config/feature_flags/development/support_group_level_merge_checks_setting.yml
new file mode 100644
index 00000000000..66cb9830261
--- /dev/null
+++ b/config/feature_flags/development/support_group_level_merge_checks_setting.yml
@@ -0,0 +1,8 @@
+---
+name: support_group_level_merge_checks_setting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102864
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377723
+milestone: '15.8'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/update_oauth_registration_flow.yml b/config/feature_flags/development/update_oauth_registration_flow.yml
deleted file mode 100644
index 7b066ebf9ab..00000000000
--- a/config/feature_flags/development/update_oauth_registration_flow.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: update_oauth_registration_flow
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85871
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364342
-milestone: '15.2'
-type: development
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_repository_cache.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_repository_cache.yml
new file mode 100644
index 00000000000..07fbc77c960
--- /dev/null
+++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_repository_cache.yml
@@ -0,0 +1,8 @@
+---
+name: use_primary_and_secondary_stores_for_repository_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107232#note_1216317991
+rollout_issue_url:
+milestone: '15.7'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_repository_cache.yml b/config/feature_flags/development/use_primary_store_as_default_for_repository_cache.yml
new file mode 100644
index 00000000000..adf48021597
--- /dev/null
+++ b/config/feature_flags/development/use_primary_store_as_default_for_repository_cache.yml
@@ -0,0 +1,8 @@
+---
+name: use_primary_store_as_default_for_repository_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107232#note_1216317991
+rollout_issue_url:
+milestone: '15.7'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/validate_release_with_author.yml b/config/feature_flags/development/validate_release_with_author.yml
index 45102103183..bac23edfa89 100644
--- a/config/feature_flags/development/validate_release_with_author.yml
+++ b/config/feature_flags/development/validate_release_with_author.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365350
 milestone: '15.1'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/vue_broadcast_messages.yml b/config/feature_flags/development/vue_broadcast_messages.yml
deleted file mode 100644
index bc9425e93ba..00000000000
--- a/config/feature_flags/development/vue_broadcast_messages.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: vue_broadcast_messages
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98127"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368847
-milestone: '15.4'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/vue_group_select.yml b/config/feature_flags/development/your_work_sidebar.yml
index d31f57a3eb9..b24af6e1ff4 100644
--- a/config/feature_flags/development/vue_group_select.yml
+++ b/config/feature_flags/development/your_work_sidebar.yml
@@ -1,8 +1,8 @@
 ---
-name: vue_group_select
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98597
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381042
-milestone: '15.6'
+name: your_work_sidebar
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107345
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385855
+milestone: '15.8'
 type: development
 group: group::foundations
 default_enabled: false