Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

72 files changed, 265 insertions, 228 deletions

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
index c2701705616..1d33a162445 100644
--- a/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
+++ b/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292024
 milestone: '13.7'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_config_visualization_tab.yml b/config/feature_flags/development/ci_config_visualization_tab.yml
index 70e395d83e9..cdc7322b7fd 100644
--- a/config/feature_flags/development/ci_config_visualization_tab.yml
+++ b/config/feature_flags/development/ci_config_visualization_tab.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290117
 milestone: '13.7'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_include_multiple_files_from_project.yml b/config/feature_flags/development/ci_include_multiple_files_from_project.yml
deleted file mode 100644
index a291287bd4f..00000000000
--- a/config/feature_flags/development/ci_include_multiple_files_from_project.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_include_multiple_files_from_project
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45991
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271560
-milestone: '13.6'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_editor_page.yml b/config/feature_flags/development/ci_pipeline_editor_page.yml
index 9870f419842..313126f3444 100644
--- a/config/feature_flags/development/ci_pipeline_editor_page.yml
+++ b/config/feature_flags/development/ci_pipeline_editor_page.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270059
 milestone: '13.6'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+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
index e3be9e7323d..7e2ae1edd34 100644
--- a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
+++ b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
@@ -2,6 +2,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
+milestone: '13.7'
 group: group::memory
 type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_rules_variables.yml b/config/feature_flags/development/ci_rules_variables.yml
index fdd9de19472..8ea2e21af14 100644
--- a/config/feature_flags/development/ci_rules_variables.yml
+++ b/config/feature_flags/development/ci_rules_variables.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289803
 milestone: '13.7'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml b/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
deleted file mode 100644
index 6e030c3685a..00000000000
--- a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_seed_block_run_before_workflow_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45674
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270439
-milestone: '13.6'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/collect_package_events_redis.yml b/config/feature_flags/development/collect_package_events_redis.yml
index bc440a44f84..54dcf7c1bc6 100644
--- a/config/feature_flags/development/collect_package_events_redis.yml
+++ b/config/feature_flags/development/collect_package_events_redis.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46846
 rollout_issue_url:
 group: group::package
 type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/devops_adoption_feature.yml
index 34ade24cbc6..0b643b4e60e 100644
--- a/config/feature_flags/development/devops_adoption_feature.yml
+++ b/config/feature_flags/development/devops_adoption_feature.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568
 milestone: '13.6'
 type: development
-group: group::analytics
-default_enabled: true
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/vue_2fa_recovery_codes.yml b/config/feature_flags/development/drag_comment_selection.yml
index 7995b00f9ab..a34d2a6231b 100644
--- a/config/feature_flags/development/vue_2fa_recovery_codes.yml
+++ b/config/feature_flags/development/drag_comment_selection.yml
@@ -1,8 +1,8 @@
 ---
-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
+name: drag_comment_selection
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49875
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293945
 milestone: '13.7'
 type: development
-group: group::access
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only.yml b/config/feature_flags/development/feature_flags_legacy_read_only.yml
deleted file mode 100644
index b960d2df1fa..00000000000
--- a/config/feature_flags/development/feature_flags_legacy_read_only.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: feature_flags_legacy_read_only
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38353
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-milestone: '13.3'
-type: development
-group: group::progressive delivery
-default_enabled: true
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml b/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
deleted file mode 100644
index 28438a130f4..00000000000
--- a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: feature_flags_legacy_read_only_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40431
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-milestone: '13.4'
-type: development
-group: group::progressive delivery
-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
deleted file mode 100644
index 38ff6b65eaa..00000000000
--- a/config/feature_flags/development/github_import_pull_request_reviews.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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/gitpod.yml b/config/feature_flags/development/gitpod.yml
deleted file mode 100644
index 616aae4be45..00000000000
--- a/config/feature_flags/development/gitpod.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitpod
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37985
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258206
-milestone: '13.4'
-type: development
-group: group::editor
-default_enabled: true
diff --git a/config/feature_flags/development/gl_tooltips.yml b/config/feature_flags/development/gl_tooltips.yml
new file mode 100644
index 00000000000..22c67019c33
--- /dev/null
+++ b/config/feature_flags/development/gl_tooltips.yml
@@ -0,0 +1,8 @@
+---
+name: gl_tooltips
+introduced_by_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292972
+milestone: '13.8'
+type: development
+group: group::editor
+default_enabled: false
diff --git a/config/feature_flags/development/graphql_logging.yml b/config/feature_flags/development/graphql_logging.yml
index 30f03a60a06..c3615215048 100644
--- a/config/feature_flags/development/graphql_logging.yml
+++ b/config/feature_flags/development/graphql_logging.yml
@@ -1,8 +1,8 @@
 ---
 name: graphql_logging
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27885
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35579
 milestone: '12.0'
 type: development
-group: 
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/group_members_filtered_search.yml b/config/feature_flags/development/group_members_filtered_search.yml
deleted file mode 100644
index 8a30bdd3d92..00000000000
--- a/config/feature_flags/development/group_members_filtered_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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/invisible_captcha.yml b/config/feature_flags/development/invisible_captcha.yml
deleted file mode 100644
index bfe118c1826..00000000000
--- a/config/feature_flags/development/invisible_captcha.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invisible_captcha
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31625
-rollout_issue_url: 
-milestone: '12.2'
-type: development
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_full_namespace_sync.yml b/config/feature_flags/development/jira_connect_full_namespace_sync.yml
deleted file mode 100644
index 90fe97be409..00000000000
--- a/config/feature_flags/development/jira_connect_full_namespace_sync.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: jira_connect_full_namespace_sync
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43880
-rollout_issue_url: 
-type: development
-group: group::ecosystem
-default_enabled: false
diff --git a/config/feature_flags/development/reset_integrations.yml b/config/feature_flags/development/jira_sync_deployments.yml
index 332fbc96ef5..8a644d43ba0 100644
--- a/config/feature_flags/development/reset_integrations.yml
+++ b/config/feature_flags/development/jira_sync_deployments.yml
@@ -1,7 +1,7 @@
 ---
-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
+name: jira_sync_deployments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49757
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294034
 milestone: '13.7'
 type: development
 group: group::ecosystem
diff --git a/config/feature_flags/development/jira_sync_feature_flags.yml b/config/feature_flags/development/jira_sync_feature_flags.yml
new file mode 100644
index 00000000000..c5925766919
--- /dev/null
+++ b/config/feature_flags/development/jira_sync_feature_flags.yml
@@ -0,0 +1,8 @@
+---
+name: jira_sync_feature_flags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50390
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296990
+milestone: '13.8'
+type: development
+group: group::ecosystem
+default_enabled: false
diff --git a/config/feature_flags/development/lfs_chunked_encoding.yml b/config/feature_flags/development/lfs_chunked_encoding.yml
deleted file mode 100644
index 92f534d1000..00000000000
--- a/config/feature_flags/development/lfs_chunked_encoding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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:
-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
deleted file mode 100644
index 9fd1eecbe5a..00000000000
--- a/config/feature_flags/development/merge_ref_auto_sync.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_ref_auto_sync
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29569
-rollout_issue_url: 
-milestone: '12.1'
-type: development
-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
deleted file mode 100644
index 3aec2b4e062..00000000000
--- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_ref_auto_sync_lock
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31082
-rollout_issue_url: 
-milestone: '12.2'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/show_inherited_labels.yml b/config/feature_flags/development/multiple_todos.yml
index 1ee1daaf0af..6ac797b7e5e 100644
--- a/config/feature_flags/development/show_inherited_labels.yml
+++ b/config/feature_flags/development/multiple_todos.yml
@@ -1,8 +1,8 @@
 ---
-name: show_inherited_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42960
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267547
-milestone: '13.5'
+name: multiple_todos
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47629
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/28355
+milestone: '13.8'
 type: development
 group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/test_failure_history.yml b/config/feature_flags/development/new_jira_connect_ui.yml
index 4a0424aae9e..8783c1ed7fd 100644
--- a/config/feature_flags/development/test_failure_history.yml
+++ b/config/feature_flags/development/new_jira_connect_ui.yml
@@ -1,8 +1,8 @@
 ---
-name: test_failure_history
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45027
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268249
-milestone: '13.6'
+name: new_jira_connect_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50692
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295647
+milestone: '13.8'
 type: development
-group: group::testing
+group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/development/new_project_level_vsa_backend.yml b/config/feature_flags/development/new_project_level_vsa_backend.yml
deleted file mode 100644
index 988e5e39a03..00000000000
--- a/config/feature_flags/development/new_project_level_vsa_backend.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/pat_creation_api_for_admin.yml b/config/feature_flags/development/non_public_artifacts.yml
index 246f7623cc9..e2a2fd49df7 100644
--- a/config/feature_flags/development/pat_creation_api_for_admin.yml
+++ b/config/feature_flags/development/non_public_artifacts.yml
@@ -1,7 +1,8 @@
 ---
-name: pat_creation_api_for_admin
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45152
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267553
+name: non_public_artifacts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49775
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294503
+milestone: '13.8'
 type: development
-group: group::access
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/optional_code_owners_sections.yml b/config/feature_flags/development/optional_code_owners_sections.yml
new file mode 100644
index 00000000000..a7933f42fc9
--- /dev/null
+++ b/config/feature_flags/development/optional_code_owners_sections.yml
@@ -0,0 +1,8 @@
+---
+name: optional_code_owners_sections
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51002
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/development/packages_and_registries_group_settings.yml b/config/feature_flags/development/packages_and_registries_group_settings.yml
new file mode 100644
index 00000000000..8712fa4895d
--- /dev/null
+++ b/config/feature_flags/development/packages_and_registries_group_settings.yml
@@ -0,0 +1,8 @@
+---
+name: packages_and_registries_group_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51460
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297371
+milestone: '13.8'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/cd_skipped_deployment_status.yml b/config/feature_flags/development/pages_migration_mark_as_not_deployed.yml
index 45d9538ebfc..f8b28785a2d 100644
--- a/config/feature_flags/development/cd_skipped_deployment_status.yml
+++ b/config/feature_flags/development/pages_migration_mark_as_not_deployed.yml
@@ -1,7 +1,8 @@
-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'
+---
+name: pages_migration_mark_as_not_deployed
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49473
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295187
+milestone: '13.8'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/reviewer_approval_rules.yml b/config/feature_flags/development/reviewer_approval_rules.yml
index 97181ef2a36..78bc52de5b3 100644
--- a/config/feature_flags/development/reviewer_approval_rules.yml
+++ b/config/feature_flags/development/reviewer_approval_rules.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293742
 milestone: '13.7'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/restrict_access_to_build_debug_mode.yml b/config/feature_flags/development/s3_multithreaded_uploads.yml
index 6d195e03842..cab1925488a 100644
--- a/config/feature_flags/development/restrict_access_to_build_debug_mode.yml
+++ b/config/feature_flags/development/s3_multithreaded_uploads.yml
@@ -1,8 +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'
+name: s3_multithreaded_uploads
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50922
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296772
+milestone: '13.8'
 type: development
 group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_analytics.yml b/config/feature_flags/development/search_settings_in_page.yml
index f91475fcbd7..26db77ebdb7 100644
--- a/config/feature_flags/development/graphql_pipeline_analytics.yml
+++ b/config/feature_flags/development/search_settings_in_page.yml
@@ -1,8 +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
+name: search_settings_in_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50207
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294025
 milestone: '13.7'
 type: development
-group: group::continuos integration
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/security_on_demand_scans_site_validation.yml b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
index 9085c22b773..bfe02a0bad7 100644
--- a/config/feature_flags/development/security_on_demand_scans_site_validation.yml
+++ b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241815
 milestone: '13.4'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/service_desk_custom_address.yml b/config/feature_flags/development/service_desk_custom_address.yml
deleted file mode 100644
index e7db2f10e2f..00000000000
--- a/config/feature_flags/development/service_desk_custom_address.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: service_desk_custom_address
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284656
-milestone:
-type: development
-group: group::certify
-default_enabled: true
diff --git a/config/feature_flags/development/set_user_availability_status.yml b/config/feature_flags/development/set_user_availability_status.yml
index be3ff522ccc..dd48ddef6d5 100644
--- a/config/feature_flags/development/set_user_availability_status.yml
+++ b/config/feature_flags/development/set_user_availability_status.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281073
 milestone: '13.6'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_bridge_dependency_variables.yml b/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml
index 54670f93601..678a52ee613 100644
--- a/config/feature_flags/development/ci_bridge_dependency_variables.yml
+++ b/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml
@@ -1,7 +1,8 @@
 ---
-name: ci_bridge_dependency_variables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46530
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273734
+name: skip_dag_manual_and_delayed_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50765
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297240
+milestone: '13.8'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/startup_css.yml b/config/feature_flags/development/sourcegraph.yml
index 88a1cd77c95..12170aec869 100644
--- a/config/feature_flags/development/startup_css.yml
+++ b/config/feature_flags/development/sourcegraph.yml
@@ -1,8 +1,8 @@
 ---
-name: startup_css
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39713
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238718
-milestone: '13.3'
+name: sourcegraph
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292199
+milestone: '12.5'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/suggestions_custom_commit.yml b/config/feature_flags/development/suggestions_custom_commit.yml
new file mode 100644
index 00000000000..e51e219ee1d
--- /dev/null
+++ b/config/feature_flags/development/suggestions_custom_commit.yml
@@ -0,0 +1,8 @@
+---
+name: suggestions_custom_commit
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297404
+milestone: '13.9'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/track_unique_wiki_page_views.yml b/config/feature_flags/development/track_unique_wiki_page_views.yml
index eb2bf1304d9..39d25352e73 100644
--- a/config/feature_flags/development/track_unique_wiki_page_views.yml
+++ b/config/feature_flags/development/track_unique_wiki_page_views.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44622
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267162
 milestone: '13.5'
 type: development
-group: group::knowledge
+group: group::editor
 default_enabled: true
diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml
index 68a1cd8996f..0176d8c55ba 100644
--- a/config/feature_flags/development/unified_diff_components.yml
+++ b/config/feature_flags/development/unified_diff_components.yml
@@ -4,4 +4,4 @@ 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::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml b/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
deleted file mode 100644
index 60a68005235..00000000000
--- a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: upload_middleware_jwt_params_handler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33277
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233895
-milestone: '13.4'
-type: development
-group: group::package
-default_enabled: true
diff --git a/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml b/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml
index d67624deb41..a85ceaf2520 100644
--- a/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml
@@ -1,7 +1,7 @@
 ---
-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
+name: usage_data_i_code_review_mr_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
 milestone: '13.7'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
new file mode 100644
index 00000000000..cc9623f6cf4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_mr_single_file_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/mr_commit_neighbor_nav.yml b/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
index 1605aaa80e4..777914da403 100644
--- a/config/feature_flags/development/mr_commit_neighbor_nav.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
@@ -1,8 +1,8 @@
 ---
-name: mr_commit_neighbor_nav
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28596
+name: usage_data_i_code_review_user_close_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
 rollout_issue_url: 
-milestone: '13.0'
+milestone: '13.8'
 type: development
 group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
index 0eda7b1ca4f..beb211c6f35 100644
--- a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
@@ -1,8 +1,8 @@
 ---
-name: hide_jump_to_next_unresolved_in_threads
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37873
+name: usage_data_i_code_review_user_create_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
 rollout_issue_url: 
-milestone: '13.3'
+milestone: '13.8'
 type: development
 group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
new file mode 100644
index 00000000000..1c727263a8e
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
new file mode 100644
index 00000000000..4777926d4b1
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
new file mode 100644
index 00000000000..fdc3b4569ef
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_review_note
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51521
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
new file mode 100644
index 00000000000..2280cfdd564
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_edit_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
new file mode 100644
index 00000000000..b4b34b4e166
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_edit_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
index 3021388b17f..0ef596ac915 100644
--- a/config/feature_flags/development/widget_visibility_polling.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
@@ -1,8 +1,8 @@
 ---
-name: widget_visibility_polling
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318
+name: usage_data_i_code_review_user_merge_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
 rollout_issue_url: 
-milestone: '12.10'
+milestone: '13.8'
 type: development
 group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
new file mode 100644
index 00000000000..079ceb023f4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_publish_review
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51351
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
new file mode 100644
index 00000000000..c7d462e9243
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_remove_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
new file mode 100644
index 00000000000..b8ec5984788
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_remove_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/merge_orchestration_service.yml b/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
index 52de3b6e733..9a5c2ecc26a 100644
--- a/config/feature_flags/development/merge_orchestration_service.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
@@ -1,8 +1,8 @@
 ---
-name: merge_orchestration_service
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28532
+name: usage_data_i_code_review_user_reopen_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
 rollout_issue_url: 
-milestone: '12.10'
+milestone: '13.8'
 type: development
-group: group::continuous integration
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
new file mode 100644
index 00000000000..f77b15f9442
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_single_file_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml b/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
new file mode 100644
index 00000000000..38bce2529dd
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_full_code_quality_report_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49079
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml b/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml
new file mode 100644
index 00000000000..720b94fcf6e
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_group_code_coverage_visit_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51382
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml b/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml
new file mode 100644
index 00000000000..2c086b211ba
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_metrics_report_widget_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50790
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml b/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml
new file mode 100644
index 00000000000..6efb6bea040
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_web_performance_widget_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46746
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+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
deleted file mode 100644
index 38e94e74399..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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_incidents_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
deleted file mode 100644
index 1bb602730e7..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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/usage_data_p_terraform_state_api_unique_users.yml b/config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml
new file mode 100644
index 00000000000..e11fb0a8b25
--- /dev/null
+++ b/config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_p_terraform_state_api_unique_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50224
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::configure
+default_enabled: true
diff --git a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml b/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
index 589b7073b22..306e37ac308 100644
--- a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml
+++ b/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
@@ -1,8 +1,8 @@
 ---
-name: coverage_fuzzing_mr_widget
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43545
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257839
-milestone: '13.6'
+name: usage_data_track_ci_templates_unique_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50481
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296880
+milestone: '13.8'
 type: development
-group: group::fuzz testing
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml b/config/feature_flags/development/value_stream_analytics_extended_form.yml
index 84d45d51c78..1cdb9111af4 100644
--- a/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml
+++ b/config/feature_flags/development/value_stream_analytics_extended_form.yml
@@ -1,8 +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
+name: value_stream_analytics_extended_form
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50229
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294190
 milestone: '13.7'
 type: development
-group: group::continuous integration
+group: group::optimize
 default_enabled: false
diff --git a/config/feature_flags/development/variable_inside_variable.yml b/config/feature_flags/development/variable_inside_variable.yml
new file mode 100644
index 00000000000..1e75576a97a
--- /dev/null
+++ b/config/feature_flags/development/variable_inside_variable.yml
@@ -0,0 +1,8 @@
+---
+name: variable_inside_variable
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/variables_in_include_section_ci.yml b/config/feature_flags/development/variables_in_include_section_ci.yml
new file mode 100644
index 00000000000..f6fc810e6f2
--- /dev/null
+++ b/config/feature_flags/development/variables_in_include_section_ci.yml
@@ -0,0 +1,8 @@
+---
+name: variables_in_include_section_ci
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50188/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294294
+milestone: '13.8'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/vue_group_members_list.yml b/config/feature_flags/development/vue_group_members_list.yml
deleted file mode 100644
index d864f904992..00000000000
--- a/config/feature_flags/development/vue_group_members_list.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: vue_group_members_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40548
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241194
-milestone: '13.4'
-type: development
-group: group::access
-default_enabled: true
diff --git a/config/feature_flags/development/wiki.yml b/config/feature_flags/development/wiki.yml
index 5904e6838f3..008852d2c13 100644
--- a/config/feature_flags/development/wiki.yml
+++ b/config/feature_flags/development/wiki.yml
@@ -4,5 +4,5 @@ introduced_by_url:
 rollout_issue_url: 
 milestone: 
 type: development
-group: 
+group: group::editor
 default_enabled: true
diff --git a/config/feature_flags/development/wiki_front_matter.yml b/config/feature_flags/development/wiki_front_matter.yml
index 66add349c44..39196440d17 100644
--- a/config/feature_flags/development/wiki_front_matter.yml
+++ b/config/feature_flags/development/wiki_front_matter.yml
@@ -1,8 +1,8 @@
 ---
 name: wiki_front_matter
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27706
 rollout_issue_url: 
-milestone: 
+milestone: '12.10'
 type: development
-group: 
+group: group::editor
 default_enabled: false