Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

109 files changed, 407 insertions, 186 deletions

diff --git a/config/feature_flags/development/vue_issue_header.yml b/config/feature_flags/development/add_issues_button.yml
index 6e9de057b82..cc4727a29c4 100644
--- a/config/feature_flags/development/vue_issue_header.yml
+++ b/config/feature_flags/development/add_issues_button.yml
@@ -1,8 +1,8 @@
 ---
-name: vue_issue_header
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44440
+name: add_issues_button
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47898
 rollout_issue_url:
 milestone: '13.6'
 type: development
 group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/gitlab_ci_yml_preview.yml b/config/feature_flags/development/allow_editing_commit_messages.yml
index 5b5453c0f08..74f67647cb5 100644
--- a/config/feature_flags/development/gitlab_ci_yml_preview.yml
+++ b/config/feature_flags/development/allow_editing_commit_messages.yml
@@ -1,8 +1,8 @@
 ---
-name: gitlab_ci_yml_preview
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40880
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/244905
-milestone: '13.4'
+name: allow_editing_commit_messages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49152/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290779
+milestone: '13.7'
 type: development
-group: group::ci
+group:
 default_enabled: false
diff --git a/config/feature_flags/development/allow_possible_spam.yml b/config/feature_flags/development/allow_possible_spam.yml
index 696ab3ba214..3f7a084130a 100644
--- a/config/feature_flags/development/allow_possible_spam.yml
+++ b/config/feature_flags/development/allow_possible_spam.yml
@@ -1,8 +1,8 @@
 ---
 name: allow_possible_spam
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17604
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/29830
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/33421
 milestone: '12.4'
 type: development
-group: group::portfolio management
+group: group::product planning
 default_enabled: false
diff --git a/config/feature_flags/development/boards_with_swimlanes.yml b/config/feature_flags/development/boards_with_swimlanes.yml
deleted file mode 100644
index 7080bceb777..00000000000
--- a/config/feature_flags/development/boards_with_swimlanes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: boards_with_swimlanes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/218040
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238222
-milestone: 13.6
-group: group::product planning
-type: development
-default_enabled: true
diff --git a/config/feature_flags/development/branch_list_keyset_pagination.yml b/config/feature_flags/development/branch_list_keyset_pagination.yml
index 5397282aecc..23b573e5004 100644
--- a/config/feature_flags/development/branch_list_keyset_pagination.yml
+++ b/config/feature_flags/development/branch_list_keyset_pagination.yml
@@ -1,8 +1,8 @@
 ---
 name: branch_list_keyset_pagination
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35819
-rollout_issue_url: 
+rollout_issue_url:
 milestone: '13.2'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/bulk_update_health_status.yml b/config/feature_flags/development/bulk_update_health_status.yml
deleted file mode 100644
index 29841ba584c..00000000000
--- a/config/feature_flags/development/bulk_update_health_status.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: bulk_update_health_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33065
-rollout_issue_url: 
-milestone: '13.2'
-type: development
-group: group::portfolio management
-default_enabled: true
diff --git a/config/feature_flags/development/burnup_charts.yml b/config/feature_flags/development/burnup_charts.yml
deleted file mode 100644
index 3fcc0b33b3f..00000000000
--- a/config/feature_flags/development/burnup_charts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: burnup_charts
-introduced_by_url: 
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268350
-milestone: '13.6'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/save_raw_usage_data.yml b/config/feature_flags/development/caching_experiments.yml
index 44820fe2f53..3d540aca476 100644
--- a/config/feature_flags/development/save_raw_usage_data.yml
+++ b/config/feature_flags/development/caching_experiments.yml
@@ -1,8 +1,8 @@
 ---
-name: save_raw_usage_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38457
+name: caching_experiments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49669
 rollout_issue_url: 
-milestone: '13.3'
+milestone: '13.7'
 type: development
-group: group::product analytics
+group: group::adoption
 default_enabled: false
diff --git a/config/feature_flags/development/environment_auto_stop_start_on_create.yml b/config/feature_flags/development/cd_skipped_deployment_status.yml
index 4950449ad9c..45d9538ebfc 100644
--- a/config/feature_flags/development/environment_auto_stop_start_on_create.yml
+++ b/config/feature_flags/development/cd_skipped_deployment_status.yml
@@ -1,7 +1,6 @@
----
-name: environment_auto_stop_start_on_create
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47239
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281449
+name: cd_skipped_deployment_status
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46614
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/283884
 milestone: '13.6'
 type: development
 group: group::release
diff --git a/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml b/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
new file mode 100644
index 00000000000..c2701705616
--- /dev/null
+++ b/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
@@ -0,0 +1,8 @@
+---
+name: ci_allow_failure_with_exit_codes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49145
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292024
+milestone: '13.7'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/ci_auto_cancel_all_pipelines.yml b/config/feature_flags/development/ci_auto_cancel_all_pipelines.yml
index e20baf93500..7dfc6146b08 100644
--- a/config/feature_flags/development/ci_auto_cancel_all_pipelines.yml
+++ b/config/feature_flags/development/ci_auto_cancel_all_pipelines.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/275997
 milestone: '13.6'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_bridge_dependency_variables.yml b/config/feature_flags/development/ci_bridge_dependency_variables.yml
index db23a30d2cb..54670f93601 100644
--- a/config/feature_flags/development/ci_bridge_dependency_variables.yml
+++ b/config/feature_flags/development/ci_bridge_dependency_variables.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46530
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273734
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_variable_expansion_in_rules_changes.yml b/config/feature_flags/development/ci_config_visualization_tab.yml
index a3a66295896..70e395d83e9 100644
--- a/config/feature_flags/development/ci_variable_expansion_in_rules_changes.yml
+++ b/config/feature_flags/development/ci_config_visualization_tab.yml
@@ -1,7 +1,8 @@
 ---
-name: ci_variable_expansion_in_rules_changes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45037
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267192
+name: ci_config_visualization_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48793
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290117
+milestone: '13.7'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml b/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml
new file mode 100644
index 00000000000..f50d71fc71f
--- /dev/null
+++ b/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml
@@ -0,0 +1,8 @@
+---
+name: ci_cross_pipeline_artifacts_download
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48342 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/287622 
+milestone: '13.7'
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml b/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml
new file mode 100644
index 00000000000..20a38d77407
--- /dev/null
+++ b/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml
@@ -0,0 +1,8 @@
+---
+name: ci_live_trace_use_fog_attributes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47536
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285079
+milestone: '13.6'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
new file mode 100644
index 00000000000..e3be9e7323d
--- /dev/null
+++ b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
@@ -0,0 +1,7 @@
+---
+name: ci_pipeline_open_merge_requests
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38673
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292727
+group: group::memory
+type: development
+default_enabled: false
diff --git a/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml b/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml
new file mode 100644
index 00000000000..84d45d51c78
--- /dev/null
+++ b/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml
@@ -0,0 +1,8 @@
+---
+name: ci_pipelines_for_merge_request_finder_new_cte
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49083
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291006
+milestone: '13.7'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/ci_manual_bridges.yml b/config/feature_flags/development/ci_rules_variables.yml
index 6bda63e71ae..fdd9de19472 100644
--- a/config/feature_flags/development/ci_manual_bridges.yml
+++ b/config/feature_flags/development/ci_rules_variables.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_manual_bridges
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44011
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263412
-milestone: '13.5'
+name: ci_rules_variables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48752
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289803
+milestone: '13.7'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/core_security_mr_widget_counts.yml b/config/feature_flags/development/core_security_mr_widget_counts.yml
new file mode 100644
index 00000000000..23a671d427c
--- /dev/null
+++ b/config/feature_flags/development/core_security_mr_widget_counts.yml
@@ -0,0 +1,8 @@
+---
+name: core_security_mr_widget_counts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47656
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284097
+milestone: '13.7'
+type: development
+group: group::static analysis
+default_enabled: false
diff --git a/config/feature_flags/development/core_security_mr_widget_downloads.yml b/config/feature_flags/development/core_security_mr_widget_downloads.yml
new file mode 100644
index 00000000000..d89fbc302b3
--- /dev/null
+++ b/config/feature_flags/development/core_security_mr_widget_downloads.yml
@@ -0,0 +1,8 @@
+---
+name: core_security_mr_widget_downloads
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48769
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273418
+milestone: '13.7'
+type: development
+group: group::static analysis
+default_enabled: true
diff --git a/config/feature_flags/development/group_level_integrations.yml b/config/feature_flags/development/datadog_ci_integration.yml
index 2be5207e099..c53ef36f3c1 100644
--- a/config/feature_flags/development/group_level_integrations.yml
+++ b/config/feature_flags/development/datadog_ci_integration.yml
@@ -1,8 +1,7 @@
 ---
-name: group_level_integrations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27557
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575
-milestone: '12.10'
+name: datadog_ci_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46564
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284088
 type: development
 group: group::ecosystem
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/default_merge_ref_for_diffs.yml b/config/feature_flags/development/default_merge_ref_for_diffs.yml
index 8442240e442..1058cff5e8f 100644
--- a/config/feature_flags/development/default_merge_ref_for_diffs.yml
+++ b/config/feature_flags/development/default_merge_ref_for_diffs.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34472
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276917
 milestone: '13.4'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/dependency_proxy_for_private_groups.yml b/config/feature_flags/development/dependency_proxy_for_private_groups.yml
new file mode 100644
index 00000000000..0bc795ba02e
--- /dev/null
+++ b/config/feature_flags/development/dependency_proxy_for_private_groups.yml
@@ -0,0 +1,8 @@
+---
+name: dependency_proxy_for_private_groups
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46042
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276777
+milestone: '13.7'
+type: development
+group: group::package
+default_enabled: true
diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/devops_adoption_feature.yml
index 7032c52c390..34ade24cbc6 100644
--- a/config/feature_flags/development/devops_adoption_feature.yml
+++ b/config/feature_flags/development/devops_adoption_feature.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568
 milestone: '13.6'
 type: development
 group: group::analytics
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/reactive_caching_limit_environment.yml b/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml
index 2569f51eaad..d67624deb41 100644
--- a/config/feature_flags/development/reactive_caching_limit_environment.yml
+++ b/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml
@@ -1,8 +1,8 @@
 ---
-name: reactive_caching_limit_environment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34202
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202633
-milestone: '13.2'
+name: diff_check_with_paths_changed_rpc
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46116
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/288827
+milestone: '13.7'
 type: development
-group: group::configure
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/diffs_gradual_load.yml b/config/feature_flags/development/diffs_gradual_load.yml
new file mode 100644
index 00000000000..05246639069
--- /dev/null
+++ b/config/feature_flags/development/diffs_gradual_load.yml
@@ -0,0 +1,8 @@
+---
+name: diffs_gradual_load
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48253/
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
index 354dfebbf6d..6f4235acaac 100644
--- a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
+++ b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
@@ -4,5 +4,5 @@ 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::health
+group: group::monitor
 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 d460e491480..b81b6b25473 100644
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097
 milestone: '13.5'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/pages_serve_from_artifacts_archive.yml b/config/feature_flags/development/forti_token_cloud.yml
index 4cc29601e48..10f143ca912 100644
--- a/config/feature_flags/development/pages_serve_from_artifacts_archive.yml
+++ b/config/feature_flags/development/forti_token_cloud.yml
@@ -1,8 +1,8 @@
 ---
-name: pages_serve_from_artifacts_archive
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46320
+name: forti_token_cloud
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49089
 rollout_issue_url:
-group: group::release management
-milestone: '13.4'
+milestone: '13.7'
 type: development
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/geo_snippet_repository_replication.yml b/config/feature_flags/development/geo_snippet_repository_replication.yml
index 69aa7beef55..5815c9a1f6d 100644
--- a/config/feature_flags/development/geo_snippet_repository_replication.yml
+++ b/config/feature_flags/development/geo_snippet_repository_replication.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224168
 milestone: '13.4'
 type: development
 group: group::geo
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/gitaly_go_user_merge_branch.yml b/config/feature_flags/development/gitaly_go_user_merge_branch.yml
new file mode 100644
index 00000000000..3804a3f56b5
--- /dev/null
+++ b/config/feature_flags/development/gitaly_go_user_merge_branch.yml
@@ -0,0 +1,8 @@
+---
+name: gitaly_go_user_merge_branch
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
+type: development
+group: 
+default_enabled: false
diff --git a/config/feature_flags/development/github_import_pull_request_reviews.yml b/config/feature_flags/development/github_import_pull_request_reviews.yml
new file mode 100644
index 00000000000..38ff6b65eaa
--- /dev/null
+++ b/config/feature_flags/development/github_import_pull_request_reviews.yml
@@ -0,0 +1,8 @@
+---
+name: github_import_pull_request_reviews
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48632
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289153
+milestone: '13.7'
+type: development
+group: group::import
+default_enabled: true
diff --git a/config/feature_flags/development/highlight_current_diff_row.yml b/config/feature_flags/development/gitlab_experiments.yml
index fc872ea47fc..51fa6aa4529 100644
--- a/config/feature_flags/development/highlight_current_diff_row.yml
+++ b/config/feature_flags/development/gitlab_experiments.yml
@@ -1,8 +1,8 @@
 ---
-name: highlight_current_diff_row
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27937
+name: gitlab_experiments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840
 rollout_issue_url: 
-milestone: '13.4'
+milestone: '13.7'
 type: development
-group: group::source code
+group: group::adoption
 default_enabled: false
diff --git a/config/feature_flags/development/graphql_board_lists.yml b/config/feature_flags/development/graphql_board_lists.yml
index 19785015f1b..a107dce7dfa 100644
--- a/config/feature_flags/development/graphql_board_lists.yml
+++ b/config/feature_flags/development/graphql_board_lists.yml
@@ -1,7 +1,7 @@
 ---
 name: graphql_board_lists
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37905
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/248908
 milestone: '13.4'
 type: development
 group: group::project management
diff --git a/config/feature_flags/development/graphql_pipeline_analytics.yml b/config/feature_flags/development/graphql_pipeline_analytics.yml
new file mode 100644
index 00000000000..f91475fcbd7
--- /dev/null
+++ b/config/feature_flags/development/graphql_pipeline_analytics.yml
@@ -0,0 +1,8 @@
+---
+name: graphql_pipeline_analytics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48267
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290153
+milestone: '13.7'
+type: development
+group: group::continuos integration
+default_enabled: false
diff --git a/config/feature_flags/development/group_ci_cd_analytics_page.yml b/config/feature_flags/development/group_ci_cd_analytics_page.yml
new file mode 100644
index 00000000000..9f25ca7e6ad
--- /dev/null
+++ b/config/feature_flags/development/group_ci_cd_analytics_page.yml
@@ -0,0 +1,8 @@
+---
+name: group_ci_cd_analytics_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49608
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292601
+milestone: '13.8'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/group_members_filtered_search.yml b/config/feature_flags/development/group_members_filtered_search.yml
new file mode 100644
index 00000000000..8a30bdd3d92
--- /dev/null
+++ b/config/feature_flags/development/group_members_filtered_search.yml
@@ -0,0 +1,8 @@
+---
+name: group_members_filtered_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48272
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289911
+milestone: '13.7'
+type: development
+group: group::access
+default_enabled: true
diff --git a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
index 6337f6154d9..0eda7b1ca4f 100644
--- a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
+++ b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37873
 rollout_issue_url: 
 milestone: '13.3'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/import_requirements_csv.yml b/config/feature_flags/development/import_requirements_csv.yml
new file mode 100644
index 00000000000..736d2204b44
--- /dev/null
+++ b/config/feature_flags/development/import_requirements_csv.yml
@@ -0,0 +1,8 @@
+---
+name: import_requirements_csv
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48060
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284846
+milestone: '13.7'
+type: development
+group: group::product planning
+default_enabled: true
diff --git a/config/feature_flags/development/increased_diff_limits.yml b/config/feature_flags/development/increased_diff_limits.yml
index ee811c221dc..898f6597a8a 100644
--- a/config/feature_flags/development/increased_diff_limits.yml
+++ b/config/feature_flags/development/increased_diff_limits.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40357
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241185
 milestone: '13.5'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/jira_sync_builds.yml b/config/feature_flags/development/jira_sync_builds.yml
new file mode 100644
index 00000000000..8cb054b848d
--- /dev/null
+++ b/config/feature_flags/development/jira_sync_builds.yml
@@ -0,0 +1,8 @@
+---
+name: jira_sync_builds
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49348
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292013
+milestone: '13.7'
+type: development
+group: group::ecosystem
+default_enabled: false
diff --git a/config/feature_flags/development/suggest_pipeline.yml b/config/feature_flags/development/lfs_chunked_encoding.yml
index 69c14e24303..92f534d1000 100644
--- a/config/feature_flags/development/suggest_pipeline.yml
+++ b/config/feature_flags/development/lfs_chunked_encoding.yml
@@ -1,8 +1,8 @@
 ---
-name: suggest_pipeline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45926
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267492
+name: lfs_chunked_encoding
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48269
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285581
 milestone: '13.6'
 type: development
-group: group::expansion
+group:
 default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync.yml b/config/feature_flags/development/merge_ref_auto_sync.yml
index f22a18940c7..9fd1eecbe5a 100644
--- a/config/feature_flags/development/merge_ref_auto_sync.yml
+++ b/config/feature_flags/development/merge_ref_auto_sync.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29
 rollout_issue_url: 
 milestone: '12.1'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync_lock.yml b/config/feature_flags/development/merge_ref_auto_sync_lock.yml
index e26c5ed5050..3aec2b4e062 100644
--- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml
+++ b/config/feature_flags/development/merge_ref_auto_sync_lock.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31
 rollout_issue_url: 
 milestone: '12.2'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
index 60db901d801..0cce0bbf3ba 100644
--- a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
+++ b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38273
 rollout_issue_url: 
 milestone: '13.5'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/merge_request_draft_filter.yml b/config/feature_flags/development/merge_request_draft_filter.yml
index ee719f52b7c..0614485d37c 100644
--- a/config/feature_flags/development/merge_request_draft_filter.yml
+++ b/config/feature_flags/development/merge_request_draft_filter.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942
 rollout_issue_url: 
 milestone: '13.3'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/merge_request_reviewers.yml b/config/feature_flags/development/merge_request_reviewers.yml
index ca9de4af264..85582ee25f9 100644
--- a/config/feature_flags/development/merge_request_reviewers.yml
+++ b/config/feature_flags/development/merge_request_reviewers.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190
 milestone: '13.4'
 type: development
-group: group::source code
-default_enabled: false
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml
index 2969b91039a..0f4e6fe41ca 100644
--- a/config/feature_flags/development/merge_request_widget_graphql.yml
+++ b/config/feature_flags/development/merge_request_widget_graphql.yml
@@ -1,8 +1,8 @@
 ---
 name: merge_request_widget_graphql
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267560
 milestone: '13.3'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/metrics_dashboard.yml b/config/feature_flags/development/metrics_dashboard.yml
index 81eafa74ab4..39a7fd1260b 100644
--- a/config/feature_flags/development/metrics_dashboard.yml
+++ b/config/feature_flags/development/metrics_dashboard.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29634
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257902
 milestone: '13.0'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/http_integrations_list.yml b/config/feature_flags/development/mr_collapsed_approval_rules.yml
index 3567f7b446d..5fca48ddc3a 100644
--- a/config/feature_flags/development/http_integrations_list.yml
+++ b/config/feature_flags/development/mr_collapsed_approval_rules.yml
@@ -1,8 +1,8 @@
 ---
-name: http_integrations_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45993
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255502
+name: mr_collapsed_approval_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284052
 milestone: '13.6'
 type: development
-group: group::health
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/mr_commit_neighbor_nav.yml b/config/feature_flags/development/mr_commit_neighbor_nav.yml
index d49dc656858..1605aaa80e4 100644
--- a/config/feature_flags/development/mr_commit_neighbor_nav.yml
+++ b/config/feature_flags/development/mr_commit_neighbor_nav.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28596
 rollout_issue_url: 
 milestone: '13.0'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
index c44d14a6dfc..3f2381e9ff6 100644
--- a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
+++ b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
@@ -3,5 +3,5 @@ name: mrc_api_use_raw_diffs_from_gitaly
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46190
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/225322
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/multiline_comments.yml b/config/feature_flags/development/multiline_comments.yml
index dad02bf80fd..ed38e1a575f 100644
--- a/config/feature_flags/development/multiline_comments.yml
+++ b/config/feature_flags/development/multiline_comments.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37114
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/211255
 milestone: '13.2'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml b/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
index efc18603fdc..6c04d08369f 100644
--- a/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
+++ b/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46437
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273573
 milestone: '13.6'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: false
diff --git a/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml b/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
index 3f79783d805..0354b18fafd 100644
--- a/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
+++ b/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263276
 milestone: '13.5'
 type: development
 group: group::continuous integration
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/feature_flags_new_version.yml b/config/feature_flags/development/new_project_level_vsa_backend.yml
index f42054ce3ef..988e5e39a03 100644
--- a/config/feature_flags/development/feature_flags_new_version.yml
+++ b/config/feature_flags/development/new_project_level_vsa_backend.yml
@@ -1,8 +1,8 @@
 ---
-name: feature_flags_new_version
-introduced_by_url: 
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258831
+name: new_project_level_vsa_backend
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282435
 milestone: '13.7'
 type: development
-group: group::progressive delivery
+group: group::optimize
 default_enabled: true
diff --git a/config/feature_flags/development/operations.yml b/config/feature_flags/development/operations.yml
new file mode 100644
index 00000000000..5b5537ed740
--- /dev/null
+++ b/config/feature_flags/development/operations.yml
@@ -0,0 +1,8 @@
+---
+name: operations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48347
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::editor
+default_enabled: true
diff --git a/config/feature_flags/development/pages_serve_from_deployments.yml b/config/feature_flags/development/pages_serve_from_deployments.yml
index ab75ec16952..f73e9f5b49d 100644
--- a/config/feature_flags/development/pages_serve_from_deployments.yml
+++ b/config/feature_flags/development/pages_serve_from_deployments.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/29
 milestone: '13.6'
 type: development
 group: group::Release Management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/pages_use_legacy_storage_lease.yml b/config/feature_flags/development/pages_use_legacy_storage_lease.yml
new file mode 100644
index 00000000000..548a3ecd589
--- /dev/null
+++ b/config/feature_flags/development/pages_use_legacy_storage_lease.yml
@@ -0,0 +1,8 @@
+---
+name: pages_use_legacy_storage_lease
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48349
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282464
+milestone: '13.7'
+type: development
+group: group::release
+default_enabled: true
diff --git a/config/feature_flags/development/paginated_notes.yml b/config/feature_flags/development/paginated_notes.yml
index 67036d693e3..733e23083d2 100644
--- a/config/feature_flags/development/paginated_notes.yml
+++ b/config/feature_flags/development/paginated_notes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34628
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254987
 milestone: '13.2'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/performance_bar_stats.yml b/config/feature_flags/development/performance_bar_stats.yml
new file mode 100644
index 00000000000..79315050c58
--- /dev/null
+++ b/config/feature_flags/development/performance_bar_stats.yml
@@ -0,0 +1,8 @@
+---
+name: performance_bar_stats
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48149
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285480
+milestone: '13.7'
+type: development
+group: group::product_planning
+default_enabled: false
diff --git a/config/feature_flags/development/pg_hint_plan_for_issuables.yml b/config/feature_flags/development/pg_hint_plan_for_issuables.yml
deleted file mode 100644
index 06d20c404c5..00000000000
--- a/config/feature_flags/development/pg_hint_plan_for_issuables.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pg_hint_plan_for_issuables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46289
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273528
-milestone: '13.6'
-type: development
-group: group::project planning
-default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_aggregated_metrics.yml b/config/feature_flags/development/postgres_hll_batch_counting.yml
index 7f13b4c68a4..87d3c7816a1 100644
--- a/config/feature_flags/development/product_analytics_aggregated_metrics.yml
+++ b/config/feature_flags/development/postgres_hll_batch_counting.yml
@@ -1,8 +1,8 @@
 ---
-name: product_analytics_aggregated_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44624
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267550
-milestone: '13.6'
+name: postgres_hll_batch_counting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48233
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285485
+milestone: '13.7'
 type: development
 group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/prometheus_computed_alerts.yml b/config/feature_flags/development/prometheus_computed_alerts.yml
index 428a99c1c1e..5a9a989d544 100644
--- a/config/feature_flags/development/prometheus_computed_alerts.yml
+++ b/config/feature_flags/development/prometheus_computed_alerts.yml
@@ -4,5 +4,5 @@ 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'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: false
diff --git a/config/feature_flags/development/push_rules_supersede_code_owners.yml b/config/feature_flags/development/push_rules_supersede_code_owners.yml
index 7226e443640..504cd7ec38e 100644
--- a/config/feature_flags/development/push_rules_supersede_code_owners.yml
+++ b/config/feature_flags/development/push_rules_supersede_code_owners.yml
@@ -3,5 +3,5 @@ name: push_rules_supersede_code_owners
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44126
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262019
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/remove_resolve_note.yml b/config/feature_flags/development/remove_resolve_note.yml
index f5ec26f7580..0f792dffd0b 100644
--- a/config/feature_flags/development/remove_resolve_note.yml
+++ b/config/feature_flags/development/remove_resolve_note.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45549
 rollout_issue_url: 
 milestone: '13.6'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/reset_integrations.yml b/config/feature_flags/development/reset_integrations.yml
new file mode 100644
index 00000000000..332fbc96ef5
--- /dev/null
+++ b/config/feature_flags/development/reset_integrations.yml
@@ -0,0 +1,8 @@
+---
+name: reset_integrations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47546
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/283875
+milestone: '13.7'
+type: development
+group: group::ecosystem
+default_enabled: false
diff --git a/config/feature_flags/development/restrict_access_to_build_debug_mode.yml b/config/feature_flags/development/restrict_access_to_build_debug_mode.yml
new file mode 100644
index 00000000000..6d195e03842
--- /dev/null
+++ b/config/feature_flags/development/restrict_access_to_build_debug_mode.yml
@@ -0,0 +1,8 @@
+---
+name: restrict_access_to_build_debug_mode
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48932
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292661
+milestone: '13.7'
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/reviewer_approval_rules.yml b/config/feature_flags/development/reviewer_approval_rules.yml
new file mode 100644
index 00000000000..97181ef2a36
--- /dev/null
+++ b/config/feature_flags/development/reviewer_approval_rules.yml
@@ -0,0 +1,8 @@
+---
+name: reviewer_approval_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46738
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293742
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/saas_add_seats_button.yml b/config/feature_flags/development/saas_add_seats_button.yml
new file mode 100644
index 00000000000..1817481439a
--- /dev/null
+++ b/config/feature_flags/development/saas_add_seats_button.yml
@@ -0,0 +1,8 @@
+---
+name: saas_add_seats_button
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49242
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291060
+milestone: '13.7'
+type: development
+group: group::purchase
+default_enabled: false
diff --git a/config/feature_flags/development/saml_group_links.yml b/config/feature_flags/development/saml_group_links.yml
index cb02b426b29..3b427bd83fa 100644
--- a/config/feature_flags/development/saml_group_links.yml
+++ b/config/feature_flags/development/saml_group_links.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267020
 milestone: '13.6'
 type: development
 group: group::access
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/security_on_demand_scans_http_header_validation.yml b/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml
index 475cbfa4d9a..0ab96f16547 100644
--- a/config/feature_flags/development/security_on_demand_scans_http_header_validation.yml
+++ b/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml
@@ -1,8 +1,8 @@
 ---
-name: security_on_demand_scans_http_header_validation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42812
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276403
-milestone: '13.6'
+name: security_dast_site_profiles_additional_fields
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46848
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292897
+milestone: '13.7'
 type: development
 group: group::dynamic analysis
 default_enabled: false
diff --git a/config/feature_flags/development/service_desk_custom_address.yml b/config/feature_flags/development/service_desk_custom_address.yml
index 8b248da00cd..e7db2f10e2f 100644
--- a/config/feature_flags/development/service_desk_custom_address.yml
+++ b/config/feature_flags/development/service_desk_custom_address.yml
@@ -1,8 +1,8 @@
 ---
 name: service_desk_custom_address
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284656
+milestone:
 type: development
 group: group::certify
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/settings_operations_prometheus_service.yml b/config/feature_flags/development/settings_operations_prometheus_service.yml
index 3b2fea80a2d..27ccaf782c2 100644
--- a/config/feature_flags/development/settings_operations_prometheus_service.yml
+++ b/config/feature_flags/development/settings_operations_prometheus_service.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24296
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258560
 milestone: '12.8'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: false
diff --git a/config/feature_flags/development/smart_cobertura_parser.yml b/config/feature_flags/development/smart_cobertura_parser.yml
new file mode 100644
index 00000000000..a3aa182e412
--- /dev/null
+++ b/config/feature_flags/development/smart_cobertura_parser.yml
@@ -0,0 +1,8 @@
+---
+name: smart_cobertura_parser
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48048
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284822
+milestone: '13.7'
+type: development
+group: group::testing
+default_enabled: false
diff --git a/config/feature_flags/development/sort_diffs.yml b/config/feature_flags/development/sort_diffs.yml
new file mode 100644
index 00000000000..505b5f0e0b5
--- /dev/null
+++ b/config/feature_flags/development/sort_diffs.yml
@@ -0,0 +1,8 @@
+---
+name: sort_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49118
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/squash_options.yml b/config/feature_flags/development/squash_options.yml
index 70114cfa252..bea03c6e9b2 100644
--- a/config/feature_flags/development/squash_options.yml
+++ b/config/feature_flags/development/squash_options.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33930
 rollout_issue_url: 
 milestone: '13.2'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml
index 63470c2a28d..68a1cd8996f 100644
--- a/config/feature_flags/development/unified_diff_components.yml
+++ b/config/feature_flags/development/unified_diff_components.yml
@@ -3,5 +3,5 @@ name: unified_diff_components
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44974
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268039
 type: development
-group: group::source code
+group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml b/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
index 1daf82b4b8a..9d668c73052 100644
--- a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
+++ b/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233786
 milestone: '13.4'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/view_diffs_file_by_file.yml b/config/feature_flags/development/usage_data_design_action.yml
index 1af945bf30b..e013237ecca 100644
--- a/config/feature_flags/development/view_diffs_file_by_file.yml
+++ b/config/feature_flags/development/usage_data_design_action.yml
@@ -1,8 +1,8 @@
 ---
-name: view_diffs_file_by_file
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35223
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229848
-milestone: '13.2'
+name: usage_data_design_action
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46626
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/287630
+milestone: '13.7'
 type: development
-group: group::source code
+group: group::knowledge
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_g_compliance_dashboard.yml b/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
index fcef95c2b01..2ca2893b1a9 100644
--- a/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
+++ b/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
@@ -1,8 +1,8 @@
 ---
 name: usage_data_g_compliance_dashboard
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url:
+rollout_issue_url:
+milestone:
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_snippets_show.yml b/config/feature_flags/development/usage_data_i_snippets_show.yml
new file mode 100644
index 00000000000..446338d5b95
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_snippets_show.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_snippets_show
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48113
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::editor
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
index 5e4eb0d61af..488053dcf2d 100644
--- a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
+++ b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41881
 rollout_issue_url: 
 milestone: '13.4'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
index c3e59a0c323..bc9aaef47ef 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml b/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml
new file mode 100644
index 00000000000..63432e2f476
--- /dev/null
+++ b/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_incident_management_alert_create_incident
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::monitor
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
index c858de35d56..2868f920d5b 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
index 198289db02d..f5133676231 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml
new file mode 100644
index 00000000000..38e94e74399
--- /dev/null
+++ b/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_incident_management_alerts_total_unique_counts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::monitor
+default_enabled: false
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
index 1b5b2d1f8a0..14fc5f92744 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
index 9eff79d3d4a..8babb4557a6 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
index 1e857525d06..474466dd057 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
index c562501fdad..6c6f9a58071 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_created.yml b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
index d6c4a082714..4a9b742c0ef 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_created.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
index d9a9f9f5e5e..08bdd429fc3 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
index 1cc30a4683e..4785c8224e4 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
index 414f47e1137..8dc2e623caf 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
index a09b8bf2f3f..90226a7c3e2 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
index 7d3a9bbff39..c00f79d1e05 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 milestone: '13.4'
 type: development
-group: group::health
+group: group::monitor
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
new file mode 100644
index 00000000000..1bb602730e7
--- /dev/null
+++ b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_incident_management_incidents_total_unique_counts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::monitor
+default_enabled: false
diff --git a/config/feature_flags/development/count_uploads_size_in_storage_stats.yml b/config/feature_flags/development/usage_data_static_site_editor_commits.yml
index 524e4f4abd8..a1d790b3505 100644
--- a/config/feature_flags/development/count_uploads_size_in_storage_stats.yml
+++ b/config/feature_flags/development/usage_data_static_site_editor_commits.yml
@@ -1,8 +1,8 @@
 ---
-name: count_uploads_size_in_storage_stats
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46941
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281950
+name: usage_data_static_site_editor_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47309
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284082
 milestone: '13.6'
 type: development
-group: group::project management
+group: group::static_site_editor
 default_enabled: false
diff --git a/config/feature_flags/development/cd_auto_rollback.yml b/config/feature_flags/development/usage_data_static_site_editor_merge_requests.yml
index 0878fac7d26..b68e4d12915 100644
--- a/config/feature_flags/development/cd_auto_rollback.yml
+++ b/config/feature_flags/development/usage_data_static_site_editor_merge_requests.yml
@@ -1,8 +1,8 @@
 ---
-name: cd_auto_rollback
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45816
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35404
+name: usage_data_static_site_editor_merge_requests
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47309
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284083
 milestone: '13.6'
 type: development
-group: group::progressive delivery
+group: group::static_site_editor
 default_enabled: false
diff --git a/config/feature_flags/development/user_other_role_details.yml b/config/feature_flags/development/user_other_role_details.yml
new file mode 100644
index 00000000000..47666a1d5c5
--- /dev/null
+++ b/config/feature_flags/development/user_other_role_details.yml
@@ -0,0 +1,8 @@
+---
+name: user_other_role_details
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45635
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255170
+milestone: '13.7'
+type: development
+group: group::conversion
+default_enabled: false
diff --git a/config/feature_flags/development/unified_diff_lines.yml b/config/feature_flags/development/vue_2fa_recovery_codes.yml
index e295893acc4..7995b00f9ab 100644
--- a/config/feature_flags/development/unified_diff_lines.yml
+++ b/config/feature_flags/development/vue_2fa_recovery_codes.yml
@@ -1,8 +1,8 @@
 ---
-name: unified_diff_lines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40131
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241188
-milestone: '13.4'
+name: vue_2fa_recovery_codes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49078
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113
+milestone: '13.7'
 type: development
-group: group::source code
+group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/vue_admin_users.yml b/config/feature_flags/development/vue_admin_users.yml
new file mode 100644
index 00000000000..7464a25c0da
--- /dev/null
+++ b/config/feature_flags/development/vue_admin_users.yml
@@ -0,0 +1,8 @@
+---
+name: vue_admin_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48922
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290737
+milestone: '13.7'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/ci_job_line_links.yml b/config/feature_flags/development/vueify_shared_runners_toggle.yml
index 458c0afb6d2..b1555c5e938 100644
--- a/config/feature_flags/development/ci_job_line_links.yml
+++ b/config/feature_flags/development/vueify_shared_runners_toggle.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_job_line_links
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47532
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281727
-milestone: '13.6'
+name: vueify_shared_runners_toggle
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48452
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292441
+milestone: '13.7'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/widget_visibility_polling.yml
index 4cab4a73f8b..3021388b17f 100644
--- a/config/feature_flags/development/widget_visibility_polling.yml
+++ b/config/feature_flags/development/widget_visibility_polling.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318
 rollout_issue_url: 
 milestone: '12.10'
 type: development
-group: group::source code
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/zip_pages_deployments.yml b/config/feature_flags/development/zip_pages_deployments.yml
deleted file mode 100644
index 34aa5c03fdc..00000000000
--- a/config/feature_flags/development/zip_pages_deployments.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: zip_pages_deployments
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42834
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245308
-milestone: '13.5'
-type: development
-group: group::release management
-default_enabled: true
diff --git a/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml
new file mode 100644
index 00000000000..716b0711ef1
--- /dev/null
+++ b/config/feature_flags/experiment/null_hypothesis.yml
@@ -0,0 +1,7 @@
+---
+name: null_hypothesis
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840
+rollout_issue_url:
+type: experiment
+group: group::adoption
+default_enabled: false
diff --git a/config/feature_flags/ops/product_analytics_tracking.yml b/config/feature_flags/ops/product_analytics_tracking.yml
new file mode 100644
index 00000000000..82635ad0640
--- /dev/null
+++ b/config/feature_flags/ops/product_analytics_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: product_analytics_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46482
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285519
+milestone: '13.7'
+type: ops
+group: group::product analytics
+default_enabled: false