Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

268 files changed, 2296 insertions, 619 deletions

diff --git a/config/apollo.config.js b/config/apollo.config.js
new file mode 100644
index 00000000000..cc847f43286
--- /dev/null
+++ b/config/apollo.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  client: {
+    service: {
+      name: 'gitlab',
+      localSchemaFile: './tmp/tests/graphql/gitlab_schema.graphql',
+    },
+    includes: ['../{ee/,jh/,}app/assets/javascripts/**/*.{js,graphql}'],
+    excludes: ['../{ee/,jh/,}spec/{frontend,frontend_integration}/**/*'],
+  },
+};
diff --git a/config/events/202108302307_security__ci_configuration__sast_create_service_create.yml b/config/events/202108302307_security__ci_configuration__sast_create_service_create.yml
new file mode 100644
index 00000000000..6fb2c1878be
--- /dev/null
+++ b/config/events/202108302307_security__ci_configuration__sast_create_service_create.yml
@@ -0,0 +1,21 @@
+description: Create SAST
+category: Security::CiConfiguration::SastCreateService
+action: create
+label_description: One of "true", "false"
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: sec
+product_stage: secure
+product_group: group::static_analysis
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58230
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/202108302307_security__ci_configuration__sast_create_service_update.yml b/config/events/202108302307_security__ci_configuration__sast_create_service_update.yml
new file mode 100644
index 00000000000..c4e65e47847
--- /dev/null
+++ b/config/events/202108302307_security__ci_configuration__sast_create_service_update.yml
@@ -0,0 +1,21 @@
+description: Update SAST
+category: Security::CiConfiguration::SastCreateService
+action: update
+label_description: One of "true", "false"
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: sec
+product_stage: secure
+product_group: group::static_analysis
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58230
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/202108302307_security__ci_configuration__secret_detection_create_service_create.yml b/config/events/202108302307_security__ci_configuration__secret_detection_create_service_create.yml
new file mode 100644
index 00000000000..c0c295978f1
--- /dev/null
+++ b/config/events/202108302307_security__ci_configuration__secret_detection_create_service_create.yml
@@ -0,0 +1,21 @@
+description: Create secret detection
+category: Security::CiConfiguration::SecretDetectionCreateService
+action: create
+label_description: One of "true", "false"
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: sec
+product_stage: secure
+product_group: group::static_analysis
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58230
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/202108302307_security__ci_configuration__secret_detection_create_service_update.yml b/config/events/202108302307_security__ci_configuration__secret_detection_create_service_update.yml
new file mode 100644
index 00000000000..d2875a8e89f
--- /dev/null
+++ b/config/events/202108302307_security__ci_configuration__secret_detection_create_service_update.yml
@@ -0,0 +1,21 @@
+description: Update secret detection
+category: Security::CiConfiguration::SecretDetectionCreateService
+action: update
+label_description: One of "true", "false"
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: sec
+product_stage: secure
+product_group: group::static_analysis
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58230
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/api__group_container_repositories_list_repositories.yml b/config/events/202109151015_api__group_container_repositories_list_repositories.yml
index 4df063ec758..e5a28374fb7 100644
--- a/config/events/api__group_container_repositories_list_repositories.yml
+++ b/config/events/202109151015_api__group_container_repositories_list_repositories.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__project_container_repositories_delete_repository.yml b/config/events/202109151015_api__project_container_repositories_delete_repository.yml
index 196f7273a5c..2d3004e7a98 100644
--- a/config/events/api__project_container_repositories_delete_repository.yml
+++ b/config/events/202109151015_api__project_container_repositories_delete_repository.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__project_container_repositories_delete_tag.yml b/config/events/202109151015_api__project_container_repositories_delete_tag.yml
index cb2c7748faa..88da16d02a1 100644
--- a/config/events/api__project_container_repositories_delete_tag.yml
+++ b/config/events/202109151015_api__project_container_repositories_delete_tag.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__project_container_repositories_delete_tag_bulk.yml b/config/events/202109151015_api__project_container_repositories_delete_tag_bulk.yml
index e36f835308b..9a0f6d7f037 100644
--- a/config/events/api__project_container_repositories_delete_tag_bulk.yml
+++ b/config/events/202109151015_api__project_container_repositories_delete_tag_bulk.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__project_container_repositories_list_repositories.yml b/config/events/202109151015_api__project_container_repositories_list_repositories.yml
index 9c8063891af..d80928f92c9 100644
--- a/config/events/api__project_container_repositories_list_repositories.yml
+++ b/config/events/202109151015_api__project_container_repositories_list_repositories.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__project_container_repositories_list_tags.yml b/config/events/202109151015_api__project_container_repositories_list_tags.yml
index 5e269e2d69e..ccac708c0fc 100644
--- a/config/events/api__project_container_repositories_list_tags.yml
+++ b/config/events/202109151015_api__project_container_repositories_list_tags.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/api__pypi_packages_list_package.yml b/config/events/202109151015_api__pypi_packages_list_package.yml
index adb9d91bcee..a2382523561 100644
--- a/config/events/api__pypi_packages_list_package.yml
+++ b/config/events/202109151015_api__pypi_packages_list_package.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/cluster_applications_cluster_application_name.yml b/config/events/202109151015_cluster_applications_cluster_application_name.yml
index e993c7ce9f5..bc0196c776d 100644
--- a/config/events/cluster_applications_cluster_application_name.yml
+++ b/config/events/202109151015_cluster_applications_cluster_application_name.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: group::monitor
 product_category:
 milestone: "12.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23000
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
index 805929b01b6..c98ac8323d4 100644
--- a/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
@@ -14,5 +14,8 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
index d9377a07cf2..c453b2f035c 100644
--- a/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
@@ -14,5 +14,8 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/container_registry_notification_create_repository.yml b/config/events/202109151015_container_registry_notification_create_repository.yml
index fa455140468..f2063748eca 100644
--- a/config/events/container_registry_notification_create_repository.yml
+++ b/config/events/202109151015_container_registry_notification_create_repository.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "12.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27001
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/container_registry_notification_delete_repository.yml b/config/events/202109151015_container_registry_notification_delete_repository.yml
index ceb7c5e4155..f366a101f81 100644
--- a/config/events/container_registry_notification_delete_repository.yml
+++ b/config/events/202109151015_container_registry_notification_delete_repository.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "12.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27001
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/container_registry_notification_delete_tag.yml b/config/events/202109151015_container_registry_notification_delete_tag.yml
index 8e33c901e0e..c322972ab50 100644
--- a/config/events/container_registry_notification_delete_tag.yml
+++ b/config/events/202109151015_container_registry_notification_delete_tag.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "12.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27001
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/container_registry_notification_push_repository.yml b/config/events/202109151015_container_registry_notification_push_repository.yml
index 10edf3ceafd..7bdb2b157f2 100644
--- a/config/events/container_registry_notification_push_repository.yml
+++ b/config/events/202109151015_container_registry_notification_push_repository.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "12.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27001
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/container_registry_notification_push_tag.yml b/config/events/202109151015_container_registry_notification_push_tag.yml
index 9679dd4e52f..d250e8b2022 100644
--- a/config/events/container_registry_notification_push_tag.yml
+++ b/config/events/202109151015_container_registry_notification_push_tag.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "12.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27001
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/delete_repository_container.yml b/config/events/202109151015_delete_repository_container.yml
index 491cf9a7e4a..162f92ccffd 100644
--- a/config/events/delete_repository_container.yml
+++ b/config/events/202109151015_delete_repository_container.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47175
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/delete_tag_bulk_tag.yml b/config/events/202109151015_delete_tag_bulk_tag.yml
index feaca98bd38..2757cb48c0c 100644
--- a/config/events/delete_tag_bulk_tag.yml
+++ b/config/events/202109151015_delete_tag_bulk_tag.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48617
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/experiment_name_initial_write.yml b/config/events/202109151015_experiment_name_initial_write.yml
index f2233f7dabb..94f685af02a 100644
--- a/config/events/experiment_name_initial_write.yml
+++ b/config/events/202109151015_experiment_name_initial_write.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: growth
 product_stage: growth
-product_group: adoption
+product_group: group::adoption
 product_category:
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59713
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/experiment_name_write.yml b/config/events/202109151015_experiment_name_write.yml
index 82b5d18bd91..d4645ecc6ae 100644
--- a/config/events/experiment_name_write.yml
+++ b/config/events/202109151015_experiment_name_write.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: growth
 product_stage: growth
-product_group: adoption
+product_group: group::adoption
 product_category:
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59713
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/groups__email_campaigns_controller_click.yml b/config/events/202109151015_groups__email_campaigns_controller_click.yml
index bbc2abb8707..e758abcce28 100644
--- a/config/events/groups__email_campaigns_controller_click.yml
+++ b/config/events/202109151015_groups__email_campaigns_controller_click.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: growth
 product_stage: growth
-product_group: activation
+product_group: group::activation
 product_category:
 milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56015
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/groups__registry__repositories_controller_list_repositories.yml b/config/events/202109151015_groups__registry__repositories_controller_list_repositories.yml
index 1fafbf75103..23c58662b61 100644
--- a/config/events/groups__registry__repositories_controller_list_repositories.yml
+++ b/config/events/202109151015_groups__registry__repositories_controller_list_repositories.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/incident_management__zoom_integration_add_zoom_meeting.yml b/config/events/202109151015_incident_management__zoom_integration_add_zoom_meeting.yml
index 7b9331d3244..6b77ec83275 100644
--- a/config/events/incident_management__zoom_integration_add_zoom_meeting.yml
+++ b/config/events/202109151015_incident_management__zoom_integration_add_zoom_meeting.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: group::monitor
 product_category:
 milestone: "12.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18620
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/incident_management__zoom_integration_remove_zoom_meeting.yml b/config/events/202109151015_incident_management__zoom_integration_remove_zoom_meeting.yml
index 5abc1b8bbc7..edf8e7feacd 100644
--- a/config/events/incident_management__zoom_integration_remove_zoom_meeting.yml
+++ b/config/events/202109151015_incident_management__zoom_integration_remove_zoom_meeting.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: group::monitor
 product_category:
 milestone: "12.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18620
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/list_repositories_container.yml b/config/events/202109151015_list_repositories_container.yml
index ec3775cb9f8..c17cee5378a 100644
--- a/config/events/list_repositories_container.yml
+++ b/config/events/202109151015_list_repositories_container.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44926
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/notes__create_service_execute.yml b/config/events/202109151015_notes__create_service_execute.yml
index 39c24f05551..e42e9856cd5 100644
--- a/config/events/notes__create_service_execute.yml
+++ b/config/events/202109151015_notes__create_service_execute.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: verify
-product_group: testing
+product_group: group::testing
 product_category:
 milestone: "12.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18890
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/package_class_pull_package.yml b/config/events/202109151015_package_class_pull_package.yml
index 2a35ce0dd3a..c4f5ea53f71 100644
--- a/config/events/package_class_pull_package.yml
+++ b/config/events/202109151015_package_class_pull_package.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/package_class_push_package.yml b/config/events/202109151015_package_class_push_package.yml
index 26945c7cb9e..566ee6a9c8f 100644
--- a/config/events/package_class_push_package.yml
+++ b/config/events/202109151015_package_class_push_package.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/projects__registry__repositories_controller_delete_repository.yml b/config/events/202109151015_projects__registry__repositories_controller_delete_repository.yml
index 44c769a03a0..ea27e7d6ae5 100644
--- a/config/events/projects__registry__repositories_controller_delete_repository.yml
+++ b/config/events/202109151015_projects__registry__repositories_controller_delete_repository.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/projects__registry__repositories_controller_list_repositories.yml b/config/events/202109151015_projects__registry__repositories_controller_list_repositories.yml
index 6dc67091a9a..6d587cc6a9e 100644
--- a/config/events/projects__registry__repositories_controller_list_repositories.yml
+++ b/config/events/202109151015_projects__registry__repositories_controller_list_repositories.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/projects__registry__tags_controller_delete_tag.yml b/config/events/202109151015_projects__registry__tags_controller_delete_tag.yml
index 73bee5f7318..d2c27320054 100644
--- a/config/events/projects__registry__tags_controller_delete_tag.yml
+++ b/config/events/202109151015_projects__registry__tags_controller_delete_tag.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/projects__registry__tags_controller_delete_tag_bulk.yml b/config/events/202109151015_projects__registry__tags_controller_delete_tag_bulk.yml
index 715e3549ed3..7b1c7199843 100644
--- a/config/events/projects__registry__tags_controller_delete_tag_bulk.yml
+++ b/config/events/202109151015_projects__registry__tags_controller_delete_tag_bulk.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/projects__registry__tags_controller_list_tags.yml b/config/events/202109151015_projects__registry__tags_controller_list_tags.yml
index 5b655ee6c39..b8e18922ffb 100644
--- a/config/events/projects__registry__tags_controller_list_tags.yml
+++ b/config/events/202109151015_projects__registry__tags_controller_list_tags.yml
@@ -8,11 +8,14 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: package
-product_group: package
+product_group: group::package
 product_category:
 milestone: "13.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 distributions:
 - ce
+- ee
 tiers:
 - free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_click_button.yml b/config/events/20211215022206_default_click_button.yml
new file mode 100644
index 00000000000..f233a4ccdfe
--- /dev/null
+++ b/config/events/20211215022206_default_click_button.yml
@@ -0,0 +1,21 @@
+description: "Reply comment on design annotations"
+category: default
+action: click_button
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_click_link.yml b/config/events/20211215022206_default_click_link.yml
new file mode 100644
index 00000000000..b19d1047580
--- /dev/null
+++ b/config/events/20211215022206_default_click_link.yml
@@ -0,0 +1,21 @@
+description: "Go to evironments documentation"
+category: default
+action: click_link
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57160
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_click_menu.yml b/config/events/20211215022206_default_click_menu.yml
new file mode 100644
index 00000000000..3e8dc847ce3
--- /dev/null
+++ b/config/events/20211215022206_default_click_menu.yml
@@ -0,0 +1,25 @@
+description: "Click navigation menu"
+category: default
+action: click_menu
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+  sidebar_display:
+    type: string
+  menu_display:
+    type: string
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62030
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_click_menu_item.yml b/config/events/20211215022206_default_click_menu_item.yml
new file mode 100644
index 00000000000..6f8a8fd8fb2
--- /dev/null
+++ b/config/events/20211215022206_default_click_menu_item.yml
@@ -0,0 +1,25 @@
+description: "Click navigation menu item"
+category: default
+action: click_menu_item
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+  sidebar_display:
+    type: string
+  menu_display:
+    type: string
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62030
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_comment_button_title_button_click_button.yml b/config/events/20211215022206_default_comment_button_title_button_click_button.yml
new file mode 100644
index 00000000000..28f893d52c6
--- /dev/null
+++ b/config/events/20211215022206_default_comment_button_title_button_click_button.yml
@@ -0,0 +1,21 @@
+description: "Select comment type from dropdown"
+category: default
+action: click_button
+label_description: "`[comment_button_title]_button`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category:
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50933
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_congratulate_first_pipeline_click_button.yml b/config/events/20211215022206_default_congratulate_first_pipeline_click_button.yml
new file mode 100644
index 00000000000..c20c29b3114
--- /dev/null
+++ b/config/events/20211215022206_default_congratulate_first_pipeline_click_button.yml
@@ -0,0 +1,21 @@
+description: "Go to pipeline on pipeline celebration"
+category: default
+action: click_button
+label_description: "`congratulate_first_pipeline`"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: "`10`"
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28378
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_create_or_import_a_repository_click_link.yml b/config/events/20211215022206_default_create_or_import_a_repository_click_link.yml
new file mode 100644
index 00000000000..3c7ac2b9af4
--- /dev/null
+++ b/config/events/20211215022206_default_create_or_import_a_repository_click_link.yml
@@ -0,0 +1,21 @@
+description: "Click link to create or import a repository"
+category: default
+action: click_link
+label_description: "`Create or import a repository`"
+property_description: "`[Growth::Conversion::Experiment::LearnGitLab | Growth::Activation::Experiment::InviteForHelpContinuousOnboarding]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::conversion
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58689
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_create_value_stream_form_open_click_button.yml b/config/events/20211215022206_default_create_value_stream_form_open_click_button.yml
new file mode 100644
index 00000000000..ae8900ef174
--- /dev/null
+++ b/config/events/20211215022206_default_create_value_stream_form_open_click_button.yml
@@ -0,0 +1,21 @@
+description: "Create stream value"
+category: default
+action: click_button
+label_description: "`create_value_stream_form_open`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62865
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_create_value_stream_form_open_click_dropdown.yml b/config/events/20211215022206_default_create_value_stream_form_open_click_dropdown.yml
new file mode 100644
index 00000000000..667cb6eaa1c
--- /dev/null
+++ b/config/events/20211215022206_default_create_value_stream_form_open_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Create stream value from dropdown"
+category: default
+action: click_dropdown
+label_description: "`create_value_stream_form_open`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62865
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_delete_value_stream_form_open_click_dropdown.yml b/config/events/20211215022206_default_delete_value_stream_form_open_click_dropdown.yml
new file mode 100644
index 00000000000..6567cba4f42
--- /dev/null
+++ b/config/events/20211215022206_default_delete_value_stream_form_open_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Delete stream value from dropdown"
+category: default
+action: click_dropdown
+label_description: "`delete_value_stream_form_open`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62865
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_diff_copy_file_path_button_click_copy_file_button.yml b/config/events/20211215022206_default_diff_copy_file_path_button_click_copy_file_button.yml
new file mode 100644
index 00000000000..4d7919317fc
--- /dev/null
+++ b/config/events/20211215022206_default_diff_copy_file_path_button_click_copy_file_button.yml
@@ -0,0 +1,21 @@
+description: "Copy file path on diffs"
+category: default
+action: click_copy_file_button
+label_description: "`diff_copy_file_path_button`"
+property_description: "`diff_copy_file`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_diff_toggle_external_button_click_toggle_external_button.yml b/config/events/20211215022206_default_diff_toggle_external_button_click_toggle_external_button.yml
new file mode 100644
index 00000000000..4e5fc9fbcb1
--- /dev/null
+++ b/config/events/20211215022206_default_diff_toggle_external_button_click_toggle_external_button.yml
@@ -0,0 +1,21 @@
+description: "Click toggle external button on diff"
+category: default
+action: click_toggle_external_button
+label_description: "`diff_toggle_external_button`"
+property_description: "`diff_toggle_external`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_edit_assignee_click_invite_members.yml b/config/events/20211215022206_default_edit_assignee_click_invite_members.yml
new file mode 100644
index 00000000000..4db394216e5
--- /dev/null
+++ b/config/events/20211215022206_default_edit_assignee_click_invite_members.yml
@@ -0,0 +1,21 @@
+description: "Click edit assignee button when inviting members"
+category: default
+action: click_invite_members
+label_description: "`edit_assignee`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62505
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_edit_click_consolidated_edit.yml b/config/events/20211215022206_default_edit_click_consolidated_edit.yml
new file mode 100644
index 00000000000..e36d2be7e62
--- /dev/null
+++ b/config/events/20211215022206_default_edit_click_consolidated_edit.yml
@@ -0,0 +1,21 @@
+description: "Edit a single file"
+category: default
+action: click_consolidated_edit
+label_description: "`edit`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64179
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_edit_reviewer_click_invite_members.yml b/config/events/20211215022206_default_edit_reviewer_click_invite_members.yml
new file mode 100644
index 00000000000..d3470c1cdf7
--- /dev/null
+++ b/config/events/20211215022206_default_edit_reviewer_click_invite_members.yml
@@ -0,0 +1,21 @@
+description: "Click edit reviewer button when inviting members"
+category: default
+action: click_invite_members
+label_description: "`edit_reviewer`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62505
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_edit_value_stream_form_open_click_button.yml b/config/events/20211215022206_default_edit_value_stream_form_open_click_button.yml
new file mode 100644
index 00000000000..04494a475d7
--- /dev/null
+++ b/config/events/20211215022206_default_edit_value_stream_form_open_click_button.yml
@@ -0,0 +1,21 @@
+description: "Edit stream value"
+category: default
+action: click_button
+label_description: "`edit_value_stream_form_open`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62865
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_actions_click_dropdown.yml b/config/events/20211215022206_default_environment_actions_click_dropdown.yml
new file mode 100644
index 00000000000..09bf51ac3d3
--- /dev/null
+++ b/config/events/20211215022206_default_environment_actions_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Click a environment action button"
+category: default
+action: click_dropdown
+label_description: "`environment_actions`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_delete_click_button.yml b/config/events/20211215022206_default_environment_delete_click_button.yml
new file mode 100644
index 00000000000..6d8f7932fc2
--- /dev/null
+++ b/config/events/20211215022206_default_environment_delete_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment delete button"
+category: default
+action: click_button
+label_description: "`environment_delete`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_monitoring_click_button.yml b/config/events/20211215022206_default_environment_monitoring_click_button.yml
new file mode 100644
index 00000000000..f445c84d6d8
--- /dev/null
+++ b/config/events/20211215022206_default_environment_monitoring_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment monitoring button"
+category: default
+action: click_button
+label_description: "`environment_monitoring`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_pin_click_button.yml b/config/events/20211215022206_default_environment_pin_click_button.yml
new file mode 100644
index 00000000000..fc7400f6041
--- /dev/null
+++ b/config/events/20211215022206_default_environment_pin_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment pin button"
+category: default
+action: click_button
+label_description: "`environment_pin`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_rollback_click_button.yml b/config/events/20211215022206_default_environment_rollback_click_button.yml
new file mode 100644
index 00000000000..67849044c5a
--- /dev/null
+++ b/config/events/20211215022206_default_environment_rollback_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment rollback button"
+category: default
+action: click_button
+label_description: "`environment_rollback`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_stop_click_button.yml b/config/events/20211215022206_default_environment_stop_click_button.yml
new file mode 100644
index 00000000000..ad2974e9221
--- /dev/null
+++ b/config/events/20211215022206_default_environment_stop_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment stop button"
+category: default
+action: click_button
+label_description: "`environment_stop`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_terminal_click_button.yml b/config/events/20211215022206_default_environment_terminal_click_button.yml
new file mode 100644
index 00000000000..6f5fcc96416
--- /dev/null
+++ b/config/events/20211215022206_default_environment_terminal_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment terminal button"
+category: default
+action: click_button
+label_description: "`environment_terminal`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_environment_url_click_button.yml b/config/events/20211215022206_default_environment_url_click_button.yml
new file mode 100644
index 00000000000..74a85043848
--- /dev/null
+++ b/config/events/20211215022206_default_environment_url_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click environment URL button"
+category: default
+action: click_button
+label_description: "`environment_url`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_export_issuable_type_csv_click_button.yml b/config/events/20211215022206_default_export_issuable_type_csv_click_button.yml
new file mode 100644
index 00000000000..ec29f3af000
--- /dev/null
+++ b/config/events/20211215022206_default_export_issuable_type_csv_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click button to export issuable as CSV"
+category: default
+action: click_button
+label_description: "`export_[issuable_type]_csv`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54214
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_feature_flag_toggle_click_button.yml b/config/events/20211215022206_default_feature_flag_toggle_click_button.yml
new file mode 100644
index 00000000000..ddd641470e9
--- /dev/null
+++ b/config/events/20211215022206_default_feature_flag_toggle_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click feature flag toggle button"
+category: default
+action: click_button
+label_description: "`feature_flag_toggle`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40023
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_feature_title_click_whats_new_item.yml b/config/events/20211215022206_default_feature_title_click_whats_new_item.yml
new file mode 100644
index 00000000000..f74fa614667
--- /dev/null
+++ b/config/events/20211215022206_default_feature_title_click_whats_new_item.yml
@@ -0,0 +1,21 @@
+description: "Click item in What's new component"
+category: default
+action: click_whats_new_item
+label_description: "`[feature_title]`"
+property_description: "`[feature_url]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::adoption
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60804
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_home_page_click_go_to_preferences.yml b/config/events/20211215022206_default_home_page_click_go_to_preferences.yml
new file mode 100644
index 00000000000..6f17156c36c
--- /dev/null
+++ b/config/events/20211215022206_default_home_page_click_go_to_preferences.yml
@@ -0,0 +1,21 @@
+description: "Go to preferences from home page"
+category: default
+action: click_go_to_preferences
+label_description: "`home_page`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_mr_next_unresolved_thread_click_button.yml b/config/events/20211215022206_default_mr_next_unresolved_thread_click_button.yml
new file mode 100644
index 00000000000..0b09c1eb74d
--- /dev/null
+++ b/config/events/20211215022206_default_mr_next_unresolved_thread_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click button to jump to next unresolved thread"
+category: default
+action: click_button
+label_description: "`mr_next_unresolved_thread`"
+property_description: "`click_next_unresolved_thread_top`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml b/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml
new file mode 100644
index 00000000000..1e49d44513e
--- /dev/null
+++ b/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml
@@ -0,0 +1,21 @@
+description: "Click Terraform MR plan button"
+category: default
+action: click_terraform_mr_plan_button
+label_description: "mr_widget_terraform_mr_plan_button"
+property_description: "`terraform_mr_plan_button`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category:
+milestone: "13.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34392
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_no_pipeline_noticed_click_button.yml b/config/events/20211215022206_default_no_pipeline_noticed_click_button.yml
new file mode 100644
index 00000000000..ba2026ab074
--- /dev/null
+++ b/config/events/20211215022206_default_no_pipeline_noticed_click_button.yml
@@ -0,0 +1,21 @@
+description: "Go to pipelines after suggestion"
+category: default
+action: click_button
+label_description: "`no_pipeline_noticed`"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: "`10`"
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "12.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23823
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_reply_comment_button_click_button.yml b/config/events/20211215022206_default_reply_comment_button_click_button.yml
new file mode 100644
index 00000000000..007026bbb0b
--- /dev/null
+++ b/config/events/20211215022206_default_reply_comment_button_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click reply comment button"
+category: default
+action: click_button
+label_description: "`reply_comment_button`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category:
+milestone: "13.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53753
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_review_app_open_review_app.yml b/config/events/20211215022206_default_review_app_open_review_app.yml
new file mode 100644
index 00000000000..8ba726e4708
--- /dev/null
+++ b/config/events/20211215022206_default_review_app_open_review_app.yml
@@ -0,0 +1,21 @@
+description: "Go to review app"
+category: default
+action: open_review_app
+label_description: "`review_app`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category:
+milestone: "12.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18141
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_right_sidebar_click_edit_button.yml b/config/events/20211215022206_default_right_sidebar_click_edit_button.yml
new file mode 100644
index 00000000000..6df0f2e9bfe
--- /dev/null
+++ b/config/events/20211215022206_default_right_sidebar_click_edit_button.yml
@@ -0,0 +1,21 @@
+description: "Click edit reviewer button on right sidebar"
+category: default
+action: click_edit_button
+label_description: "`right_sidebar`"
+property_description: "`reviewer`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_search_autocomplete_suggestion_click_text.yml b/config/events/20211215022206_default_search_autocomplete_suggestion_click_text.yml
new file mode 100644
index 00000000000..ff5d321aa4d
--- /dev/null
+++ b/config/events/20211215022206_default_search_autocomplete_suggestion_click_text.yml
@@ -0,0 +1,21 @@
+description: "Click autocomplete option"
+category: default
+action: click_text
+label_description: "`search_autocomplete_suggestion`"
+property_description: "Slugged option category"
+value_description: "Option index"
+extra_properties:
+identifiers:
+product_section: enablement
+product_stage: enablement
+product_group: group::global_search
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40822
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_show_labels_toggle.yml b/config/events/20211215022206_default_show_labels_toggle.yml
new file mode 100644
index 00000000000..d7a2e16b51f
--- /dev/null
+++ b/config/events/20211215022206_default_show_labels_toggle.yml
@@ -0,0 +1,21 @@
+description: "Toggle labels on boards"
+category: default
+action: toggle
+label_description: "`show_labels`"
+property_description: "`[on | off]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ""
+product_stage: ""
+product_group: ""
+product_category:
+milestone:
+introduced_by_url:
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_slugged_stream_name_click_dropdown.yml b/config/events/20211215022206_default_slugged_stream_name_click_dropdown.yml
new file mode 100644
index 00000000000..d25e3ed4ead
--- /dev/null
+++ b/config/events/20211215022206_default_slugged_stream_name_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Selec stream from dropdown"
+category: default
+action: click_dropdown
+label_description: "Slugged stream name"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62865
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_suggest_commit_first_project_gitlab_ci_yml__click_button.yml b/config/events/20211215022206_default_suggest_commit_first_project_gitlab_ci_yml__click_button.yml
new file mode 100644
index 00000000000..ff993716f74
--- /dev/null
+++ b/config/events/20211215022206_default_suggest_commit_first_project_gitlab_ci_yml__click_button.yml
@@ -0,0 +1,21 @@
+description: "Dismiss GitLab CI suggestion popover"
+category: default
+action: click_button
+label_description: "[ `suggest_commit_first_project_gitlab_ci_yml` ]"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: "`10`"
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26105
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20211215022206_default_web_ide_click_consolidated_edit_ide.yml b/config/events/20211215022206_default_web_ide_click_consolidated_edit_ide.yml
new file mode 100644
index 00000000000..bd705f7e3a6
--- /dev/null
+++ b/config/events/20211215022206_default_web_ide_click_consolidated_edit_ide.yml
@@ -0,0 +1,21 @@
+description: "Edit multiple files with Web IDE"
+category: default
+action: click_consolidated_edit_ide
+label_description: "`web_ide`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64179
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 04804e373ab..edc6541db8c 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -9,12 +9,14 @@
 ---
 - accessibility_testing
 - advanced_deployments
+- api_security
 - attack_emulation
 - audit_events
 - audit_reports
 - authentication_and_authorization
 - auto_devops
 - backup_restore
+- build
 - build_artifacts
 - chatops
 - cloud_native_installation
@@ -33,16 +35,18 @@
 - database
 - dataops
 - delivery
-- delivery_management
 - dependency_firewall
 - dependency_proxy
 - dependency_scanning
+- deployment_management
 - design_management
+- design_system
 - devops_reports
 - disaster_recovery
 - dynamic_application_security_testing
 - editor_extension
 - environment_management
+- error_budgets
 - error_tracking
 - experimentation_activation
 - experimentation_adoption
@@ -50,20 +54,19 @@
 - experimentation_expansion
 - feature_flags
 - five_minute_production_app
-- foundations
 - fuzz_testing
 - geo_replication
 - git_lfs
 - gitaly
 - gitlab_docs
 - global_search
-- google_cloud
 - helm_chart_registry
 - horse
 - importers
 - incident_management
 - infrastructure_as_code
 - insider_threat
+- instance_resiliency
 - integrations
 - intel_code_security
 - interactive_application_security_testing
@@ -86,7 +89,6 @@
 - package_registry
 - pages
 - performance_testing
-- pipeline_abuse_prevention
 - pipeline_authoring
 - planning_analytics
 - portfolio_management
diff --git a/config/feature_flags/development/abort_deleted_project_pipelines.yml b/config/feature_flags/development/abort_deleted_project_pipelines.yml
deleted file mode 100644
index 0e7a936e6a5..00000000000
--- a/config/feature_flags/development/abort_deleted_project_pipelines.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: abort_deleted_project_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/1220
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301106
-milestone: '13.9'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/admin_deploy_keys_vue.yml b/config/feature_flags/development/admin_deploy_keys_vue.yml
index c57ed728ffb..21e1b501d7a 100644
--- a/config/feature_flags/development/admin_deploy_keys_vue.yml
+++ b/config/feature_flags/development/admin_deploy_keys_vue.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344855
 milestone: '14.5'
 type: development
 group: group::access
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/drop_detached_partitions.yml b/config/feature_flags/development/automated_email_provision.yml
index b49cf78d28c..2b3fee208ab 100644
--- a/config/feature_flags/development/drop_detached_partitions.yml
+++ b/config/feature_flags/development/automated_email_provision.yml
@@ -1,8 +1,8 @@
 ---
-name: drop_detached_partitions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67056
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337155
-milestone: '14.2'
+name: automated_email_provision
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75872
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348317
+milestone: '14.6'
 type: development
-group: group::database
+group: group::license
 default_enabled: false
diff --git a/config/feature_flags/development/branches_pagination_without_count.yml b/config/feature_flags/development/branches_pagination_without_count.yml
deleted file mode 100644
index ed29caff812..00000000000
--- a/config/feature_flags/development/branches_pagination_without_count.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: branches_pagination_without_count
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50759
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_queue_maintain.yml b/config/feature_flags/development/ci_bulk_insert_tags.yml
index 1c6f6935897..6b8ad4ef39d 100644
--- a/config/feature_flags/development/ci_pending_builds_queue_maintain.yml
+++ b/config/feature_flags/development/ci_bulk_insert_tags.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_pending_builds_queue_maintain
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61581
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331496
-milestone: '13.12'
+name: ci_bulk_insert_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73198
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346124
+milestone: '14.6'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_runner_limits_override.yml b/config/feature_flags/development/ci_namespace_project_mirrors.yml
index a5dd74d35af..a2d674c3770 100644
--- a/config/feature_flags/development/ci_runner_limits_override.yml
+++ b/config/feature_flags/development/ci_namespace_project_mirrors.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_runner_limits_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67152
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337224
-milestone: '14.2'
+name: ci_namespace_project_mirrors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75517
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346786
+milestone: '14.6'
 type: development
-group: group::runner
+group: group::sharding
 default_enabled: false
diff --git a/config/feature_flags/development/ci_optimize_project_records_destruction.yml b/config/feature_flags/development/ci_optimize_project_records_destruction.yml
deleted file mode 100644
index 73ad4ae995c..00000000000
--- a/config/feature_flags/development/ci_optimize_project_records_destruction.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_optimize_project_records_destruction
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71342
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341936
-milestone: '14.4'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_ci_minutes_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_ci_minutes_data.yml
deleted file mode 100644
index f073e94e322..00000000000
--- a/config/feature_flags/development/ci_pending_builds_maintain_ci_minutes_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_maintain_ci_minutes_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64443
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338149
-milestone: '14.2'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_build_tags_limit.yml b/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
index 8aaa03a87e3..3a5ec00c32d 100644
--- a/config/feature_flags/development/ci_build_tags_limit.yml
+++ b/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_build_tags_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68380
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338929
-milestone: '14.2'
+name: ci_pending_builds_maintain_denormalized_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75425
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332951
+milestone: '14.6'
 type: development
 group: group::pipeline execution
 default_enabled: true
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_namespace_traversal_ids.yml b/config/feature_flags/development/ci_pending_builds_maintain_namespace_traversal_ids.yml
deleted file mode 100644
index 0eafb604fed..00000000000
--- a/config/feature_flags/development/ci_pending_builds_maintain_namespace_traversal_ids.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_maintain_namespace_traversal_ids
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70162
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340930
-milestone: '14.3'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml
deleted file mode 100644
index 16b318509dc..00000000000
--- a/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_maintain_shared_runners_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64644
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338152
-milestone: '14.1'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_tags_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_tags_data.yml
deleted file mode 100644
index bd18789bbcf..00000000000
--- a/config/feature_flags/development/ci_pending_builds_maintain_tags_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_maintain_tags_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65648
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338363
-milestone: '14.2'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_project_runners_decoupling.yml b/config/feature_flags/development/ci_pending_builds_project_runners_decoupling.yml
deleted file mode 100644
index 82acc907507..00000000000
--- a/config/feature_flags/development/ci_pending_builds_project_runners_decoupling.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_project_runners_decoupling
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70415
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341005
-milestone: '14.4'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml b/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml
deleted file mode 100644
index b93742ad0a7..00000000000
--- a/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_queueing_denormalize_ci_minutes_information
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66962
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338290
-milestone: '14.2'
-type: development
-group: 'group::pipeline execution'
-default_enabled: false
diff --git a/config/feature_flags/development/ci_queueing_denormalize_namespace_traversal_ids.yml b/config/feature_flags/development/ci_queueing_denormalize_namespace_traversal_ids.yml
deleted file mode 100644
index e8326ac5cab..00000000000
--- a/config/feature_flags/development/ci_queueing_denormalize_namespace_traversal_ids.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_queueing_denormalize_namespace_traversal_ids
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70162
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340930
-milestone: '14.3'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_queueing_denormalize_shared_runners_information.yml b/config/feature_flags/development/ci_queueing_denormalize_shared_runners_information.yml
deleted file mode 100644
index 326beaf6740..00000000000
--- a/config/feature_flags/development/ci_queueing_denormalize_shared_runners_information.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_queueing_denormalize_shared_runners_information
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66082
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338289
-milestone: '14.2'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_queueing_denormalize_tags_information.yml b/config/feature_flags/development/ci_queueing_denormalize_tags_information.yml
deleted file mode 100644
index 23f7be4cccc..00000000000
--- a/config/feature_flags/development/ci_queueing_denormalize_tags_information.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_queueing_denormalize_tags_information
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65648
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338366
-milestone: '14.1'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_scoped_job_token.yml b/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
index a885a1e6391..53515ddab5a 100644
--- a/config/feature_flags/development/ci_scoped_job_token.yml
+++ b/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_scoped_job_token
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62733
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332272
-milestone: '14.0'
+name: ci_queuing_use_denormalized_data_strategy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76543
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332951
+milestone: '14.6'
 type: development
 group: group::pipeline execution
 default_enabled: true
diff --git a/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
index 868c3c84649..7e5795de6a0 100644
--- a/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
@@ -1,8 +1,8 @@
 ---
 name: ci_require_credit_card_on_free_plan
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330104
 milestone: '13.12'
 type: development
-group: group::pipeline execution
+group: group::fulfillment
 default_enabled: false
diff --git a/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
index 6a946f0959c..578101a1ba4 100644
--- a/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
@@ -1,8 +1,8 @@
 ---
 name: ci_require_credit_card_on_trial_plan
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330105
 milestone: '13.12'
 type: development
-group: group::pipeline execution
+group: group::fulfillment
 default_enabled: false
diff --git a/config/feature_flags/development/ci_predefined_vars_in_builder.yml b/config/feature_flags/development/ci_retry_downstream_pipeline.yml
index 5aacf6ee681..0eac0330188 100644
--- a/config/feature_flags/development/ci_predefined_vars_in_builder.yml
+++ b/config/feature_flags/development/ci_retry_downstream_pipeline.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_predefined_vars_in_builder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72348
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231300
-milestone: '14.4'
+name: ci_retry_downstream_pipeline
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76115
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347424
+milestone: '14.16'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_store_trace_outside_transaction.yml b/config/feature_flags/development/ci_store_trace_outside_transaction.yml
index 89b135850fe..1be425c6bbf 100644
--- a/config/feature_flags/development/ci_store_trace_outside_transaction.yml
+++ b/config/feature_flags/development/ci_store_trace_outside_transaction.yml
@@ -2,7 +2,7 @@
 name: ci_store_trace_outside_transaction
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66203
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336280
-milestone: '15.4'
+milestone: '14.5'
 type: development
 group: group::pipeline execution
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_track_shared_runner_builds.yml b/config/feature_flags/development/ci_track_shared_runner_builds.yml
deleted file mode 100644
index b4267ab5be3..00000000000
--- a/config/feature_flags/development/ci_track_shared_runner_builds.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_track_shared_runner_builds
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62912
-rollout_issue_url: 
-milestone: '14.0'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_untrack_shared_runner_builds.yml b/config/feature_flags/development/ci_untrack_shared_runner_builds.yml
deleted file mode 100644
index 2e8de5cbb0c..00000000000
--- a/config/feature_flags/development/ci_untrack_shared_runner_builds.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_untrack_shared_runner_builds
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62912
-rollout_issue_url:
-milestone: '14.0'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_yaml_limit_size.yml b/config/feature_flags/development/ci_yaml_limit_size.yml
index 2b68939968d..222dc409c45 100644
--- a/config/feature_flags/development/ci_yaml_limit_size.yml
+++ b/config/feature_flags/development/ci_yaml_limit_size.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://dev.gitlab.org/gitlab/gitlabhq/-/merge_requests/3126
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/29875
 milestone: '12.0'
 type: development
-group: group::pipeline execution
+group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/surface_environment_creation_failure_override.yml b/config/feature_flags/development/create_deployment_in_separate_transaction.yml
index 566281bcb89..7d07a932966 100644
--- a/config/feature_flags/development/surface_environment_creation_failure_override.yml
+++ b/config/feature_flags/development/create_deployment_in_separate_transaction.yml
@@ -1,8 +1,8 @@
 ---
-name: surface_environment_creation_failure_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69537
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340169
-milestone: '14.4'
+name: create_deployment_in_separate_transaction
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75604
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346879
+milestone: '14.6'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/create_vulnerabilities_via_api.yml b/config/feature_flags/development/create_vulnerabilities_via_api.yml
deleted file mode 100644
index 3f8af065dc2..00000000000
--- a/config/feature_flags/development/create_vulnerabilities_via_api.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: create_vulnerabilities_via_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68158
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338694
-milestone: '14.3'
-type: development
-group: group::threat insights
-default_enabled: true
diff --git a/config/feature_flags/development/customer_relations.yml b/config/feature_flags/development/customer_relations.yml
index 207f675423a..58783708921 100644
--- a/config/feature_flags/development/customer_relations.yml
+++ b/config/feature_flags/development/customer_relations.yml
@@ -1,7 +1,7 @@
 ---
 name: customer_relations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69472
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346082
 milestone: '14.3'
 type: development
 group: group::product planning
diff --git a/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml b/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml
deleted file mode 100644
index f1e3be78da8..00000000000
--- a/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dependency_proxy_manifest_workhorse
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73033
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344216
-milestone: '14.4'
-type: development
-group: group::package
-default_enabled: true
diff --git a/config/feature_flags/development/avoid_cross_joins_environments_in_self_and_descendants.yml b/config/feature_flags/development/deployment_approvals.yml
index 25b714b2c65..5083ccd28bf 100644
--- a/config/feature_flags/development/avoid_cross_joins_environments_in_self_and_descendants.yml
+++ b/config/feature_flags/development/deployment_approvals.yml
@@ -1,8 +1,8 @@
 ---
-name: avoid_cross_joins_environments_in_self_and_descendants
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71894
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342991
-milestone: '14.4'
+name: deployment_approvals
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74932
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347342
+milestone: '14.6'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/deployments_archive.yml b/config/feature_flags/development/deployments_archive.yml
index ad6b5fb47d9..8129d6d4af8 100644
--- a/config/feature_flags/development/deployments_archive.yml
+++ b/config/feature_flags/development/deployments_archive.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345027
 milestone: '14.5'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/display_outdated_line_diff.yml b/config/feature_flags/development/display_outdated_line_diff.yml
index 6baa258c52b..979575da381 100644
--- a/config/feature_flags/development/display_outdated_line_diff.yml
+++ b/config/feature_flags/development/display_outdated_line_diff.yml
@@ -1,8 +1,8 @@
 ---
 name: display_outdated_line_diff
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72597
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345491
 milestone: '14.5'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/configurable_diff_limits.yml b/config/feature_flags/development/early_prepare_for_mergeability.yml
index e73d45fac65..c6377bd9a60 100644
--- a/config/feature_flags/development/configurable_diff_limits.yml
+++ b/config/feature_flags/development/early_prepare_for_mergeability.yml
@@ -1,8 +1,8 @@
 ---
-name: configurable_diff_limits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56722
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332194
-milestone: '14.0'
+name: early_prepare_for_mergeability
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75402
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346667
+milestone: '14.6'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml b/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml
deleted file mode 100644
index a265d9528f7..00000000000
--- a/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: environments_by_deployments_finder_exists_optimization
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72781/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343544
-milestone: '14.5'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml b/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml
new file mode 100644
index 00000000000..dda23cb641a
--- /dev/null
+++ b/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml
@@ -0,0 +1,8 @@
+---
+name: expire_job_and_pipeline_cache_synchronously
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75611
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1380
+milestone: '14.6'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/find_tag_via_gitaly.yml b/config/feature_flags/development/find_tag_via_gitaly.yml
index 217eac464ad..43cbdb3993f 100644
--- a/config/feature_flags/development/find_tag_via_gitaly.yml
+++ b/config/feature_flags/development/find_tag_via_gitaly.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340899
 milestone: '14.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/validate_namespace_parent_type.yml b/config/feature_flags/development/hide_access_tokens.yml
index 5c2e0add243..1607780a0d0 100644
--- a/config/feature_flags/development/validate_namespace_parent_type.yml
+++ b/config/feature_flags/development/hide_access_tokens.yml
@@ -1,8 +1,8 @@
 ---
-name: validate_namespace_parent_type
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54094
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322101
-milestone: '13.10'
+name: hide_access_tokens
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76280
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347490
+milestone: '14.6'
 type: development
 group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/cached_mr_title.yml b/config/feature_flags/development/highlight_js.yml
index 0284663f441..40ea462447e 100644
--- a/config/feature_flags/development/cached_mr_title.yml
+++ b/config/feature_flags/development/highlight_js.yml
@@ -1,8 +1,8 @@
 ---
-name: cached_mr_title
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61605
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330907
-milestone: '13.12'
+name: highlight_js
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75005
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346257
+milestone: '14.6'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/configure_iac_scanning_via_mr.yml b/config/feature_flags/development/improved_container_scan_matching.yml
index cef22644b8f..81a486831cc 100644
--- a/config/feature_flags/development/configure_iac_scanning_via_mr.yml
+++ b/config/feature_flags/development/improved_container_scan_matching.yml
@@ -1,8 +1,8 @@
 ---
-name: configure_iac_scanning_via_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73155
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343966
-milestone: '14.5'
+name: improved_container_scan_matching
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73486
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344534
+milestone: '14.6'
 type: development
-group: group::static analysis
+group: group::container security
 default_enabled: true
diff --git a/config/feature_flags/development/track_importer_activity.yml b/config/feature_flags/development/incident_escalations.yml
index 9f20a14790e..ea823f573aa 100644
--- a/config/feature_flags/development/track_importer_activity.yml
+++ b/config/feature_flags/development/incident_escalations.yml
@@ -1,8 +1,8 @@
 ---
-name: track_importer_activity
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339392
-milestone: '14.4'
+name: incident_escalations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74337
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345769
+milestone: '14.6'
 type: development
-group: group::import
+group: group::monitor
 default_enabled: false
diff --git a/config/feature_flags/development/increased_diff_limits.yml b/config/feature_flags/development/increased_diff_limits.yml
deleted file mode 100644
index 898f6597a8a..00000000000
--- a/config/feature_flags/development/increased_diff_limits.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: increased_diff_limits
-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::code review
-default_enabled: false
diff --git a/config/feature_flags/development/jira_use_first_ref_by_oid.yml b/config/feature_flags/development/jira_use_first_ref_by_oid.yml
index 10e2ad1b8ad..88db6c1ab4c 100644
--- a/config/feature_flags/development/jira_use_first_ref_by_oid.yml
+++ b/config/feature_flags/development/jira_use_first_ref_by_oid.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343585
 milestone: '14.5'
 type: development
 group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_queueing_builds_enabled_checks.yml b/config/feature_flags/development/jobs_tab_vue.yml
index effaf78cef2..2958532922a 100644
--- a/config/feature_flags/development/ci_queueing_builds_enabled_checks.yml
+++ b/config/feature_flags/development/jobs_tab_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_queueing_builds_enabled_checks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70581
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341131
-milestone: '14.4'
+name: jobs_tab_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76146
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347371
+milestone: '14.6'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/lfk_automatic_partition_creation.yml b/config/feature_flags/development/lfk_automatic_partition_creation.yml
new file mode 100644
index 00000000000..72678ff9cbf
--- /dev/null
+++ b/config/feature_flags/development/lfk_automatic_partition_creation.yml
@@ -0,0 +1,8 @@
+---
+name: lfk_automatic_partition_creation
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346907
+milestone: '14.6'
+type: development
+group: group::sharding
+default_enabled: false
diff --git a/config/feature_flags/development/lfk_automatic_partition_dropping.yml b/config/feature_flags/development/lfk_automatic_partition_dropping.yml
new file mode 100644
index 00000000000..5b908a3309e
--- /dev/null
+++ b/config/feature_flags/development/lfk_automatic_partition_dropping.yml
@@ -0,0 +1,8 @@
+---
+name: lfk_automatic_partition_dropping
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346908
+milestone: '14.6'
+type: development
+group: group::sharding
+default_enabled: false
diff --git a/config/feature_flags/development/files_api_throttling.yml b/config/feature_flags/development/lfs_auto_link_fork_source.yml
index a106c2cb980..022bcdd3128 100644
--- a/config/feature_flags/development/files_api_throttling.yml
+++ b/config/feature_flags/development/lfs_auto_link_fork_source.yml
@@ -1,8 +1,8 @@
 ---
-name: files_api_throttling
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68560
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338903
-milestone: '14.3'
+name: lfs_auto_link_fork_source
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75972
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348243
+milestone: '14.6'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/linear_user_membership_groups.yml b/config/feature_flags/development/linear_group_descendants_finder.yml
index 19bca849090..12f09c25c85 100644
--- a/config/feature_flags/development/linear_user_membership_groups.yml
+++ b/config/feature_flags/development/linear_group_descendants_finder.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_user_membership_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68842
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339432
-milestone: '14.3'
+name: linear_group_descendants_finder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68954
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339440
+milestone: '14.6'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/linear_groups_template_finder_extended_group_search.yml b/config/feature_flags/development/linear_groups_template_finder_extended_group_search.yml
deleted file mode 100644
index 98505f561b0..00000000000
--- a/config/feature_flags/development/linear_groups_template_finder_extended_group_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_groups_template_finder_extended_group_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68936
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339439
-milestone: '14.3'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/linear_application_settings_elasticsearch_limited_namespaces.yml b/config/feature_flags/development/linear_user_group_notification_settings_finder_ancestors_scopes.yml
index 27342e1e1c2..b54b82d00a0 100644
--- a/config/feature_flags/development/linear_application_settings_elasticsearch_limited_namespaces.yml
+++ b/config/feature_flags/development/linear_user_group_notification_settings_finder_ancestors_scopes.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_application_settings_elasticsearch_limited_namespaces
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68931
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339438
-milestone: '14.3'
+name: linear_user_group_notification_settings_finder_ancestors_scopes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74606
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345792
+milestone: '14.6'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/linear_user_groups_with_developer_maintainer_project_access.yml b/config/feature_flags/development/linear_user_groups_with_developer_maintainer_project_access.yml
deleted file mode 100644
index 09a910ba5f0..00000000000
--- a/config/feature_flags/development/linear_user_groups_with_developer_maintainer_project_access.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_user_groups_with_developer_maintainer_project_access
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68851
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339436
-milestone: '14.3'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/between_commits_via_list_commits.yml b/config/feature_flags/development/log_implicit_sidekiq_status_calls.yml
index f048fd4e1b6..1aeb768b3dd 100644
--- a/config/feature_flags/development/between_commits_via_list_commits.yml
+++ b/config/feature_flags/development/log_implicit_sidekiq_status_calls.yml
@@ -1,8 +1,8 @@
 ---
-name: between_commits_via_list_commits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74273
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345458
-milestone: '14.5'
+name: log_implicit_sidekiq_status_calls
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74815
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343964
+milestone: '14.6'
 type: development
-group: group::gitaly
+group: group::scalability
 default_enabled: false
diff --git a/config/feature_flags/development/migrate_user_mentions.yml b/config/feature_flags/development/migrate_user_mentions.yml
deleted file mode 100644
index 2a0e84b01c1..00000000000
--- a/config/feature_flags/development/migrate_user_mentions.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# While this FF is enabled by default, we want to keep it in place for now as there are still related migrations that
-# have not been run in production yet. For additional info, see https://gitlab.com/gitlab-org/gitlab/-/issues/21801
-# Discussion and removal MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60322
-name: migrate_user_mentions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34378
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231175
-milestone: '13.3'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/multiple_gpg_signatures.yml b/config/feature_flags/development/multiple_gpg_signatures.yml
index 3b9b8d0a465..433309aea58 100644
--- a/config/feature_flags/development/multiple_gpg_signatures.yml
+++ b/config/feature_flags/development/multiple_gpg_signatures.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345261
 milestone: '14.5'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/new_route_ci_minutes_purchase.yml b/config/feature_flags/development/new_route_ci_minutes_purchase.yml
index c34fb14a9f0..06fbfab255c 100644
--- a/config/feature_flags/development/new_route_ci_minutes_purchase.yml
+++ b/config/feature_flags/development/new_route_ci_minutes_purchase.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322582
 milestone: '13.10'
 type: development
 group: group::purchase
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/operational_vulnerabilities.yml b/config/feature_flags/development/operational_vulnerabilities.yml
index f1e19a626fb..ac92892592b 100644
--- a/config/feature_flags/development/operational_vulnerabilities.yml
+++ b/config/feature_flags/development/operational_vulnerabilities.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341423
 milestone: '14.4'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/labels_widget.yml b/config/feature_flags/development/optimized_issue_neighbor_queries.yml
index 07045a13c30..db333dace72 100644
--- a/config/feature_flags/development/labels_widget.yml
+++ b/config/feature_flags/development/optimized_issue_neighbor_queries.yml
@@ -1,8 +1,8 @@
 ---
-name: labels_widget
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62898
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332327
-milestone: '14.0'
+name: optimized_issue_neighbor_queries
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76073
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345921
+milestone: '14.6'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/packages_npm_abbreviated_metadata.yml b/config/feature_flags/development/packages_npm_abbreviated_metadata.yml
deleted file mode 100644
index ad191adfa20..00000000000
--- a/config/feature_flags/development/packages_npm_abbreviated_metadata.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: packages_npm_abbreviated_metadata
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73639
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344827
-milestone: '14.5'
-type: development
-group: group::package
-default_enabled: true
diff --git a/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml b/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml
index 297a4f65aa4..f0f60d4d0b7 100644
--- a/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml
+++ b/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338930
 milestone: '14.3'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/preserve_latest_wal_locations_for_idempotent_jobs.yml b/config/feature_flags/development/preserve_latest_wal_locations_for_idempotent_jobs.yml
index 52ef276e950..24e4823997d 100644
--- a/config/feature_flags/development/preserve_latest_wal_locations_for_idempotent_jobs.yml
+++ b/config/feature_flags/development/preserve_latest_wal_locations_for_idempotent_jobs.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338350
 milestone: '14.3'
 type: development
 group: group::memory
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/prevent_abusive_searches.yml b/config/feature_flags/development/prevent_abusive_searches.yml
new file mode 100644
index 00000000000..1c08e0d16cb
--- /dev/null
+++ b/config/feature_flags/development/prevent_abusive_searches.yml
@@ -0,0 +1,8 @@
+---
+name: prevent_abusive_searches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74953
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346263
+milestone: '14.6'
+type: development
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/reference_cache_memoization.yml b/config/feature_flags/development/reference_cache_memoization.yml
deleted file mode 100644
index 74012208174..00000000000
--- a/config/feature_flags/development/reference_cache_memoization.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: reference_cache_memoization
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71310
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341849
-milestone: '14.4'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/s3_multithreaded_uploads.yml b/config/feature_flags/development/s3_multithreaded_uploads.yml
index 92ba4da7e67..f80510a4c64 100644
--- a/config/feature_flags/development/s3_multithreaded_uploads.yml
+++ b/config/feature_flags/development/s3_multithreaded_uploads.yml
@@ -4,5 +4,5 @@ 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::pipeline execution
+group: group::testing
 default_enabled: true
diff --git a/config/feature_flags/development/partition_pruning.yml b/config/feature_flags/development/sbom_survey.yml
index 02f5dc968a4..aac523ee846 100644
--- a/config/feature_flags/development/partition_pruning.yml
+++ b/config/feature_flags/development/sbom_survey.yml
@@ -1,8 +1,8 @@
 ---
-name: partition_pruning
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67056
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337153
-milestone: '14.2'
+name: sbom_survey
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76446
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348181
+milestone: '14.6'
 type: development
-group: group::database
+group: group::secure
 default_enabled: false
diff --git a/config/feature_flags/development/limited_diff_highlighting.yml b/config/feature_flags/development/scim_token_vue.yml
index 1cfd9927c7a..8cc82bafd66 100644
--- a/config/feature_flags/development/limited_diff_highlighting.yml
+++ b/config/feature_flags/development/scim_token_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: limited_diff_highlighting
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53768
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323566
-milestone: '13.12'
+name: scim_token_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74743
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347270
+milestone: '14.6'
 type: development
-group: group::source code
+group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/secure_vulnerability_training.yml b/config/feature_flags/development/secure_vulnerability_training.yml
new file mode 100644
index 00000000000..58117482e25
--- /dev/null
+++ b/config/feature_flags/development/secure_vulnerability_training.yml
@@ -0,0 +1,8 @@
+---
+name: secure_vulnerability_training
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346074
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346308
+milestone: '14.6'
+type: development
+group: group::threat insights
+default_enabled: false
diff --git a/config/feature_flags/development/api_v3_commits_skip_diff_files.yml b/config/feature_flags/development/shimo_integration.yml
index a3a953e983c..28c0a7859bc 100644
--- a/config/feature_flags/development/api_v3_commits_skip_diff_files.yml
+++ b/config/feature_flags/development/shimo_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: api_v3_commits_skip_diff_files
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67647
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344617
+name: shimo_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73129
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345356
 milestone: '14.5'
 type: development
 group: group::integrations
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/atomic_sidekiq_scheduler.yml b/config/feature_flags/development/skip_scheduling_workers_for_replicas.yml
index ab516f61144..494bec1e665 100644
--- a/config/feature_flags/development/atomic_sidekiq_scheduler.yml
+++ b/config/feature_flags/development/skip_scheduling_workers_for_replicas.yml
@@ -1,7 +1,7 @@
 ---
-name: atomic_sidekiq_scheduler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72380
-rollout_issue_url:
+name: skip_scheduling_workers_for_replicas
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74532
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1380
 milestone: '14.5'
 type: development
 group: group::project management
diff --git a/config/feature_flags/development/surface_environment_creation_failure.yml b/config/feature_flags/development/surface_environment_creation_failure.yml
deleted file mode 100644
index acb8600b0bb..00000000000
--- a/config/feature_flags/development/surface_environment_creation_failure.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: surface_environment_creation_failure
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69537
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340169
-milestone: '14.4'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/terms_of_service_vue.yml b/config/feature_flags/development/terms_of_service_vue.yml
deleted file mode 100644
index 01bf3613127..00000000000
--- a/config/feature_flags/development/terms_of_service_vue.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: terms_of_service_vue
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343046
-milestone: '14.5'
-type: development
-group: group::access
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_instrumentation.yml b/config/feature_flags/development/usage_data_instrumentation.yml
deleted file mode 100644
index e2610cbd39c..00000000000
--- a/config/feature_flags/development/usage_data_instrumentation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_instrumentation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68808
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345252
-milestone: '14.5'
-type: development
-group: group::product intelligence
-default_enabled: false
diff --git a/config/feature_flags/development/use_cmark_renderer.yml b/config/feature_flags/development/use_cmark_renderer.yml
index b47031a6924..5e4ea534590 100644
--- a/config/feature_flags/development/use_cmark_renderer.yml
+++ b/config/feature_flags/development/use_cmark_renderer.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345744
 milestone: '14.6'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/use_optimized_group_labels_query.yml b/config/feature_flags/development/use_optimized_group_labels_query.yml
index 37e2525d03e..82cecb5f337 100644
--- a/config/feature_flags/development/use_optimized_group_labels_query.yml
+++ b/config/feature_flags/development/use_optimized_group_labels_query.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344957
 milestone: '14.5'
 type: development
 group: group::workspace
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml
new file mode 100644
index 00000000000..2204472c0a6
--- /dev/null
+++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml
@@ -0,0 +1,8 @@
+---
+name: use_primary_and_secondary_stores_for_sessions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73660
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1429
+milestone: '14.6'
+type: development
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/development/use_multi_store.yml b/config/feature_flags/development/use_primary_store_as_default_for_sessions.yml
index 48db4a092b5..ac130ab7761 100644
--- a/config/feature_flags/development/use_multi_store.yml
+++ b/config/feature_flags/development/use_primary_store_as_default_for_sessions.yml
@@ -1,8 +1,8 @@
 ---
-name: use_multi_store
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73660
+name: use_primary_store_as_default_for_sessions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75258
 rollout_issue_url:
-milestone: '14.5'
+milestone: '14.6'
 type: development
 group: group::memory
 default_enabled: false
diff --git a/config/feature_flags/development/linear_group_including_descendants_by.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
index cf70edce6cc..4fe7ca695c3 100644
--- a/config/feature_flags/development/linear_group_including_descendants_by.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_group_including_descendants_by
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68835
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339431
-milestone: '14.3'
+name: use_traversal_ids_for_ancestors_upto
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72662
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343619
+milestone: '14.6'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/keyset_pagination_for_groups_api.yml b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
index d4bd37565ee..b0550fe62d9 100644
--- a/config/feature_flags/development/keyset_pagination_for_groups_api.yml
+++ b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
@@ -1,8 +1,8 @@
 ---
-name: keyset_pagination_for_groups_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68346
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339831
-milestone: '14.3'
+name: use_traversal_ids_groups_finder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67650
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345666
+milestone: '14.6'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml b/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
deleted file mode 100644
index 605bc54b78a..00000000000
--- a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_upsert_query_for_mr_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69240
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339677
-milestone: '14.3'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/load_balancing_for_update_all_mirrors_worker.yml b/config/feature_flags/development/verify_participants_access.yml
index 1f213f52753..8857003fd47 100644
--- a/config/feature_flags/development/load_balancing_for_update_all_mirrors_worker.yml
+++ b/config/feature_flags/development/verify_participants_access.yml
@@ -1,8 +1,8 @@
 ---
-name: load_balancing_for_update_all_mirrors_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64526
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334162
-milestone: '14.1'
+name: verify_participants_access
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74906
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347407
+milestone: '14.6'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/vuln_report_new_project_filter.yml b/config/feature_flags/development/vuln_report_new_project_filter.yml
deleted file mode 100644
index 3eb02054205..00000000000
--- a/config/feature_flags/development/vuln_report_new_project_filter.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: vuln_report_new_project_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55745
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334380
-milestone: '14.3'
-type: development
-group: group::threat insights
-default_enabled: true
diff --git a/config/feature_flags/development/vulnerability_location_image_filter.yml b/config/feature_flags/development/vulnerability_location_image_filter.yml
index 4b373b76ff6..1bbc8e43d57 100644
--- a/config/feature_flags/development/vulnerability_location_image_filter.yml
+++ b/config/feature_flags/development/vulnerability_location_image_filter.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340915
 milestone: '14.4'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/webauthn.yml b/config/feature_flags/development/webauthn.yml
index 0dc9e2b7bfd..135d4af2465 100644
--- a/config/feature_flags/development/webauthn.yml
+++ b/config/feature_flags/development/webauthn.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232671
 milestone: '13.4'
 type: development
 group: group::access
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml b/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml
new file mode 100644
index 00000000000..f499263acec
--- /dev/null
+++ b/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml
@@ -0,0 +1,8 @@
+---
+name: wiki_switch_between_content_editor_raw_markdown
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74457
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345398
+milestone: '14.6'
+type: development
+group: group::editor
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_email_from.yml b/config/feature_flags/experiment/invite_email_from.yml
deleted file mode 100644
index 59baf249341..00000000000
--- a/config/feature_flags/experiment/invite_email_from.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_email_from
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68376
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/429
-milestone: '14.3'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_email_preview_text.yml b/config/feature_flags/experiment/invite_email_preview_text.yml
deleted file mode 100644
index fcb4cda0b14..00000000000
--- a/config/feature_flags/experiment/invite_email_preview_text.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_email_preview_text
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67236
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/421
-milestone: '14.2'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_for_task.yml b/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
index 30743811f26..398f3bddf8a 100644
--- a/config/feature_flags/experiment/invite_members_for_task.yml
+++ b/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
@@ -1,7 +1,7 @@
 ---
-name: invite_members_for_task
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339747
+name: invite_for_help_continuous_onboarding
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73846
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345708
 milestone: '14.5'
 type: experiment
 group: group::activation
diff --git a/config/feature_flags/experiment/invite_members_in_comment.yml b/config/feature_flags/experiment/invite_members_in_comment.yml
deleted file mode 100644
index 521574ad71b..00000000000
--- a/config/feature_flags/experiment/invite_members_in_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_in_comment
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51400'
-rollout_issue_url: 'https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/300'
-milestone: '13.10'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
deleted file mode 100644
index 216726178f1..00000000000
--- a/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_new_dropdown_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50069
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/291
-milestone: '13.8'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/member_areas_of_focus.yml b/config/feature_flags/experiment/member_areas_of_focus.yml
deleted file mode 100644
index e728ee7e3d3..00000000000
--- a/config/feature_flags/experiment/member_areas_of_focus.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: member_areas_of_focus
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65273
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/406
-milestone: '14.2'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/development/ci_new_query_for_pending_stuck_jobs.yml b/config/feature_flags/ops/ci_pipeline_creation_logger.yml
index 5e63330d01d..8f886be2fd5 100644
--- a/config/feature_flags/development/ci_new_query_for_pending_stuck_jobs.yml
+++ b/config/feature_flags/ops/ci_pipeline_creation_logger.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_new_query_for_pending_stuck_jobs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68880
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339322
-milestone: '14.3'
-type: development
+name: ci_pipeline_creation_logger
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72996
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345779
+milestone: '14.5'
+type: ops
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/refactor_text_viewer.yml b/config/feature_flags/ops/database_async_index_creation.yml
index 427137773c6..60d491b6073 100644
--- a/config/feature_flags/development/refactor_text_viewer.yml
+++ b/config/feature_flags/ops/database_async_index_creation.yml
@@ -1,8 +1,8 @@
 ---
-name: refactor_text_viewer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70909
+name: database_async_index_creation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66478
 rollout_issue_url:
-milestone: '14.4'
-type: development
-group: 'group::source code'
+milestone: '14.2'
+type: ops
+group: group::database
 default_enabled: false
diff --git a/config/feature_flags/experiment/force_company_trial.yml b/config/feature_flags/ops/feature_flag_state_logs.yml
index 85fc789085d..7153aca3860 100644
--- a/config/feature_flags/experiment/force_company_trial.yml
+++ b/config/feature_flags/ops/feature_flag_state_logs.yml
@@ -1,8 +1,8 @@
 ---
-name: force_company_trial
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65287
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335050
-milestone: '14.1'
-type: experiment
-group: group::adoption
+name: feature_flag_state_logs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73729
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345888
+milestone: '14.6'
+type: ops
+group: group::incubation
 default_enabled: false
diff --git a/config/feature_flags/ops/lower_relation_max_count_limit.yml b/config/feature_flags/ops/gtm_nonce.yml
index 7a532c0948a..b4007732aa2 100644
--- a/config/feature_flags/ops/lower_relation_max_count_limit.yml
+++ b/config/feature_flags/ops/gtm_nonce.yml
@@ -1,8 +1,8 @@
 ---
-name: lower_relation_max_count_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69620
+name: gtm_nonce
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58494
 rollout_issue_url:
-milestone: '14.3'
+milestone: '14.6'
 type: ops
-group: group::verify
+group: group::product intelligence
 default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 4e5e15d261b..05eab1a9b43 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1260,6 +1260,12 @@ production: &base
     #  address: localhost
     #  port: 8082
 
+    sidekiq_health_checks:
+    #  enabled: true
+    #  log_enabled: false
+    #  address: localhost
+    #  port: 8082
+
     # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics
     # It runs alongside the `/metrics` endpoints to ease the publish of metrics
     web_exporter:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8fb2161b14e..6444215421d 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -690,7 +690,7 @@ Gitlab.ee do
   Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/30 * * * *'
   Settings.cron_jobs['elastic_migration_worker']['job_class'] ||= 'Elastic::MigrationWorker'
   Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 3 * * * UTC"
+  Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} #{rand(3..4)} * * * UTC"
   Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
   Settings.cron_jobs['users_create_statistics_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
@@ -919,11 +919,23 @@ Settings.webpack.dev_server['https']   ||= false
 #
 Settings['monitoring'] ||= Settingslogic.new({})
 Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8']
+
 Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({})
 Settings.monitoring.sidekiq_exporter['enabled'] ||= false
 Settings.monitoring.sidekiq_exporter['log_enabled'] ||= false
 Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost'
 Settings.monitoring.sidekiq_exporter['port'] ||= 8082
+
+# TODO: Once we split out health checks from SidekiqExporter, we
+# should not let this default to the same settings anymore; we only
+# do this for back-compat currently.
+# https://gitlab.com/gitlab-org/gitlab/-/issues/345804
+Settings.monitoring['sidekiq_health_checks'] ||= Settingslogic.new({})
+Settings.monitoring.sidekiq_health_checks['enabled'] ||= Settings.monitoring.sidekiq_exporter['enabled']
+Settings.monitoring.sidekiq_health_checks['log_enabled'] ||= Settings.monitoring.sidekiq_exporter['log_enabled']
+Settings.monitoring.sidekiq_health_checks['address'] ||= Settings.monitoring.sidekiq_exporter['address']
+Settings.monitoring.sidekiq_health_checks['port'] ||= Settings.monitoring.sidekiq_exporter['port']
+
 Settings.monitoring['web_exporter'] ||= Settingslogic.new({})
 Settings.monitoring.web_exporter['enabled'] ||= false
 Settings.monitoring.web_exporter['address'] ||= 'localhost'
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 28f3da9b3df..8ef11b83131 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -28,11 +28,21 @@ Gitlab::Application.configure do |config|
   config.middleware.insert_after(Labkit::Middleware::Rack, Gitlab::Metrics::RequestsRackMiddleware)
 end
 
-Sidekiq.configure_server do |config|
-  config.on(:startup) do
-    # Do not clean the metrics directory here - the supervisor script should
-    # have already taken care of that
-    Gitlab::Metrics::Exporter::SidekiqExporter.instance.start
+if Gitlab::Runtime.sidekiq? && (!ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0')
+  # The single worker outside of a sidekiq-cluster, or the first worker (sidekiq_0)
+  # in a cluster of processes, is responsible for serving health checks.
+  #
+  # Do not clean the metrics directory here - the supervisor script should
+  # have already taken care of that.
+  Sidekiq.configure_server do |config|
+    config.on(:startup) do
+      # In https://gitlab.com/gitlab-org/gitlab/-/issues/345804 we are looking to
+      # only serve health-checks from a worker process; for backwards compatibility
+      # we still go through the metrics exporter server, but start to configure it
+      # with the new settings keys.
+      exporter_settings = Settings.monitoring.sidekiq_health_checks
+      Gitlab::Metrics::Exporter::SidekiqExporter.instance(exporter_settings).start
+    end
   end
 end
 
diff --git a/config/initializers/active_record_database_tasks.rb b/config/initializers/active_record_database_tasks.rb
new file mode 100644
index 00000000000..f06174262a9
--- /dev/null
+++ b/config/initializers/active_record_database_tasks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+return unless Gitlab.ee?
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(Gitlab::Patch::GeoDatabaseTasks)
+end
diff --git a/config/initializers/active_record_transaction_observer.rb b/config/initializers/active_record_transaction_observer.rb
index fc9b73d656e..a1d4b13344e 100644
--- a/config/initializers/active_record_transaction_observer.rb
+++ b/config/initializers/active_record_transaction_observer.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return unless Gitlab.com? || Gitlab.dev_or_test_env?
-
 def feature_flags_available?
   # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
   active_db_connection = ActiveRecord::Base.connection.active? rescue false
@@ -11,6 +9,8 @@ rescue ActiveRecord::NoDatabaseError
   false
 end
 
+return unless Gitlab.com? || Gitlab.dev_or_test_env?
+
 Gitlab::Application.configure do
   if feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml)
     Gitlab::Database::Transaction::Observer.register!
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 4fd41bd4c75..249b021c680 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -3,8 +3,8 @@
 Rails.backtrace_cleaner.remove_silencers!
 
 # This allows us to see the proper caller of SQL calls in {development,test}.log
-if (Rails.env.development? || Rails.env.test?) && Gitlab.ee?
-  Rails.backtrace_cleaner.add_silencer { |line| %r(^lib/gitlab/database/load_balancing).match?(line) }
+if Rails.env.development? || Rails.env.test?
+  Rails.backtrace_cleaner.add_silencer { |line| %r{^lib/gitlab/database/load_balancing}.match?(line) }
 end
 
 Rails.backtrace_cleaner.add_silencer { |line| !Gitlab::APP_DIRS_PATTERN.match?(line) }
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 1eb9d12812a..a3172fae027 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -8,11 +8,11 @@ Gitlab.ee do
       config.geo_database = config_for(:database_geo)
     end
   end
-end
 
-Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
-    Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
-    Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
+    # The Geo::TrackingBase model does not yet use connects_to. So,
+    # this will not properly support geo: from config/databse.yml
+    # file yet. This is ACK of the current state and will be fixed.
+    Geo::TrackingBase.establish_connection(Gitlab::Database.geo_db_config_with_default_pool_size)
   end
 end
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb
index 476230d0f70..b2cb1843fab 100644
--- a/config/initializers/doorkeeper_openid_connect.rb
+++ b/config/initializers/doorkeeper_openid_connect.rb
@@ -59,6 +59,15 @@ Doorkeeper::OpenidConnect.configure do
       o.claim(:picture)        { |user| user.avatar_url(only_path: false) }
       o.claim(:groups)         { |user| user.membership_groups.joins(:route).with_route.map(&:full_path) }
       o.claim(:groups_direct, response: [:id_token]) { |user| user.groups.joins(:route).with_route.map(&:full_path) }
+      o.claim('https://gitlab.org/claims/groups/owner') do |user|
+        user.owned_groups.joins(:route).with_route.map(&:full_path).presence
+      end
+      o.claim('https://gitlab.org/claims/groups/maintainer') do |user|
+        user.maintainers_groups.joins(:route).with_route.map(&:full_path).presence
+      end
+      o.claim('https://gitlab.org/claims/groups/developer') do |user|
+        user.developer_groups.joins(:route).with_route.map(&:full_path).presence
+      end
     end
   end
 end
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
index e5e17672c4e..2ea6c9a7343 100644
--- a/config/initializers/forbid_sidekiq_in_transactions.rb
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -20,7 +20,7 @@ module Sidekiq
       module NoEnqueueingFromTransactions
         %i(perform_async perform_at perform_in).each do |name|
           define_method(name) do |*args|
-            if !Sidekiq::Worker.skip_transaction_check && ApplicationRecord.inside_transaction?
+            if !Sidekiq::Worker.skip_transaction_check && inside_transaction?
               begin
                 raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG
                 `#{self}.#{name}` cannot be called inside a transaction as this can lead to
@@ -38,6 +38,12 @@ module Sidekiq
             super(*args)
           end
         end
+
+        private
+
+        def inside_transaction?
+          ::ApplicationRecord.inside_transaction? || ::Ci::ApplicationRecord.inside_transaction?
+        end
       end
 
       prepend NoEnqueueingFromTransactions
diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb
index 5582c642b3c..5878b8702b9 100644
--- a/config/initializers/gitlab_experiment.rb
+++ b/config/initializers/gitlab_experiment.rb
@@ -42,7 +42,7 @@ Gitlab::Experiment.configure do |config|
   # This behavior doesn't make perfect sense for self managed installs either,
   # so we don't think we should redirect in those cases.
   #
-  valid_domains = %w[about.gitlab.com docs.gitlab.com gitlab.com]
+  valid_domains = %w[about.gitlab.com docs.gitlab.com gitlab.com gdk.test localhost]
   config.redirect_url_validator = lambda do |url|
     Gitlab.dev_env_or_com? && (url = URI.parse(url)) && valid_domains.include?(url.host)
   rescue URI::InvalidURIError
diff --git a/config/initializers/kaminari_active_record_relation_methods_with_limit.rb b/config/initializers/kaminari_active_record_relation_methods_with_limit.rb
index 9a5a95403ad..982cb69e532 100644
--- a/config/initializers/kaminari_active_record_relation_methods_with_limit.rb
+++ b/config/initializers/kaminari_active_record_relation_methods_with_limit.rb
@@ -4,7 +4,6 @@ module Kaminari
   # Active Record specific page scope methods implementations
   module ActiveRecordRelationMethodsWithLimit
     MAX_COUNT_LIMIT = 10_000
-    MAX_COUNT_NEW_LOWER_LIMIT = 1_000
 
     # This is a modified version of
     # https://github.com/kaminari/kaminari/blob/c5186f5d9b7f23299d115408e62047447fd3189d/kaminari-activerecord/lib/kaminari/activerecord/active_record_relation_methods.rb#L17-L41
@@ -22,8 +21,7 @@ module Kaminari
         return @total_count = (current_page - 1) * limit_value + @records.length if @records.any? && (@records.length < limit_value)
       end
 
-      max_limit = Feature.enabled?(:lower_relation_max_count_limit, type: :ops) ? MAX_COUNT_NEW_LOWER_LIMIT : MAX_COUNT_LIMIT
-      limit = options.fetch(:limit, max_limit).to_i
+      limit = options.fetch(:limit, MAX_COUNT_LIMIT).to_i
       # #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
       c = except(:offset, :limit, :order)
       # Remove includes only if they are irrelevant
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index 5af8cf52656..f99333f7c82 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -2,7 +2,8 @@
 
 Gitlab::Database::Partitioning.register_models([
   AuditEvent,
-  WebHookLog
+  WebHookLog,
+  LooseForeignKeys::DeletedRecord
 ])
 
 if Gitlab.ee?
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 75328dcd891..bb2e01a30f1 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -19,31 +19,22 @@ cookie_key = if Rails.env.development?
                "_gitlab_session"
              end
 
-if Gitlab::Utils.to_boolean(ENV['GITLAB_REDIS_STORE_WITH_SESSION_STORE'], default: true)
-  store = Gitlab::Redis::SharedState.store(
-    namespace: Gitlab::Redis::SharedState::SESSION_NAMESPACE
-  )
+store = if Gitlab::Utils.to_boolean(ENV['GITLAB_USE_REDIS_SESSIONS_STORE'], default: true)
+          Gitlab::Redis::Sessions.store(
+            namespace: Gitlab::Redis::Sessions::SESSION_NAMESPACE
+          )
+        else
+          Gitlab::Redis::SharedState.store(
+            namespace: Gitlab::Redis::Sessions::SESSION_NAMESPACE
+          )
+        end
 
-  Gitlab::Application.config.session_store(
-    :redis_store, # Using the cookie_store would enable session replay attacks.
-    redis_store: store,
-    key: cookie_key,
-    secure: Gitlab.config.gitlab.https,
-    httponly: true,
-    expires_in: Settings.gitlab['session_expire_delay'] * 60,
-    path: Rails.application.config.relative_url_root.presence || '/'
-  )
-else
-  sessions_config = Gitlab::Redis::SharedState.params
-  sessions_config[:namespace] = Gitlab::Redis::SharedState::SESSION_NAMESPACE
-
-  Gitlab::Application.config.session_store(
-    :redis_store, # Using the cookie_store would enable session replay attacks.
-    servers: sessions_config,
-    key: cookie_key,
-    secure: Gitlab.config.gitlab.https,
-    httponly: true,
-    expires_in: Settings.gitlab['session_expire_delay'] * 60,
-    path: Rails.application.config.relative_url_root.presence || '/'
-  )
-end
+Gitlab::Application.config.session_store(
+  :redis_store, # Using the cookie_store would enable session replay attacks.
+  redis_store: store,
+  key: cookie_key,
+  secure: Gitlab.config.gitlab.https,
+  httponly: true,
+  expires_in: Settings.gitlab['session_expire_delay'] * 60,
+  path: Rails.application.config.relative_url_root.presence || '/'
+)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 23052e7ac57..baf252a5d10 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -29,7 +29,6 @@ use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer
 Sidekiq.configure_server do |config|
   config.options[:strict] = false
   config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues])
-  config.options[:scheduled_enq] = Gitlab::SidekiqEnq
 
   Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
 
@@ -115,5 +114,5 @@ Sidekiq.configure_client do |config|
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
 end
 
-Sidekiq::Client.prepend Gitlab::Patch::SidekiqClient
-Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqCronPoller
+Sidekiq::Scheduled::Poller.prepend Gitlab::Patch::SidekiqPoller
+Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqPoller
diff --git a/config/initializers/validate_database_config.rb b/config/initializers/validate_database_config.rb
index a651db8b783..d5e73cdc1ee 100644
--- a/config/initializers/validate_database_config.rb
+++ b/config/initializers/validate_database_config.rb
@@ -16,11 +16,11 @@ if configurations = ActiveRecord::Base.configurations.configurations
       "The `main:` database needs to be defined as a first configuration item instead of `#{configurations.first.name}`."
   end
 
-  rejected_config_names = configurations.map(&:name).to_set - Gitlab::Database::DATABASE_NAMES
+  rejected_config_names = configurations.map(&:name).to_set - Gitlab::Database.all_database_names
   if rejected_config_names.any?
     raise "ERROR: This installation of GitLab uses unsupported database names " \
       "in 'config/database.yml': #{rejected_config_names.to_a.join(", ")}. The only supported ones are " \
-      "#{Gitlab::Database::DATABASE_NAMES.join(", ")}."
+      "#{Gitlab::Database.all_database_names.join(", ")}."
   end
 
   replicas_config_names = configurations.select(&:replica?).map(&:name)
diff --git a/config/initializers/wikicloth_patch.rb b/config/initializers/wikicloth_patch.rb
new file mode 100644
index 00000000000..13180180c32
--- /dev/null
+++ b/config/initializers/wikicloth_patch.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+require 'wikicloth'
+require 'wikicloth/wiki_buffer/var'
+
+# Adds patch for changes in this PR: https://github.com/nricciar/wikicloth/pull/112/files
+#
+# That fix has already been merged, but the maintainers are not releasing new versions, so we
+# need to patch it here.
+#
+# If they ever do release a version, then we can remove this file.
+#
+# See: https://gitlab.com/gitlab-org/gitlab/-/issues/334056#note_745336618
+
+# Guard to ensure we remember to delete this patch if they ever release a new version of wikicloth
+raise 'New version of WikiCloth detected, please remove this patch' unless Gem::Version.new(WikiCloth::VERSION) == Gem::Version.new('0.8.1')
+
+# rubocop:disable Style/ClassAndModuleChildren
+# rubocop:disable Layout/SpaceAroundEqualsInParameterDefault
+# rubocop:disable Style/HashSyntax
+# rubocop:disable Layout/SpaceAfterComma
+# rubocop:disable Style/RescueStandardError
+# rubocop:disable Rails/Output
+# rubocop:disable Style/MethodCallWithoutArgsParentheses
+# rubocop:disable Layout/EmptyLinesAroundClassBody
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/PerceivedComplexity
+# rubocop:disable Cop/LineBreakAroundConditionalBlock
+# rubocop:disable Layout/EmptyLineAfterGuardClause
+# rubocop:disable Performance/ReverseEach
+# rubocop:disable Style/BlockDelimiters
+# rubocop:disable Cop/LineBreakAroundConditionalBlock
+# rubocop:disable Layout/MultilineBlockLayout
+# rubocop:disable Layout/BlockEndNewline
+module WikiCloth
+  class WikiCloth
+    def render(opt={})
+      self.options = { :noedit => false, :locale => I18n.default_locale, :fast => true, :output => :html, :link_handler => self.link_handler,
+                       :params => self.params, :sections => self.sections }.merge(self.options).merge(opt)
+      self.options[:link_handler].params = options[:params]
+
+      I18n.locale = self.options[:locale]
+
+      data = self.sections.collect { |s| s.render(self.options) }.join
+
+      # This is the first patched line from:
+      # https://github.com/nricciar/wikicloth/pull/112/files#diff-eed3de11b953105f9181a6859d58f52af8912d28525fd2a289f8be184e66f531R69
+      data.gsub!(/<!--.*?-->/m,"")
+
+      data << "\n" if data.last(1) != "\n"
+      data << "garbage"
+
+      buffer = WikiBuffer.new("",options)
+
+      begin
+        if self.options[:fast]
+          until data.empty?
+            case data
+            when /\A\w+/
+              data = $'
+              @current_row += $&.length
+              buffer.add_word($&)
+            when /\A[^\w]+(\w|)/m
+              data = $'
+              $&.each_char { |c| add_current_char(buffer,c) }
+            end
+          end
+        else
+          data.each_char { |c| add_current_char(buffer,c) }
+        end
+      rescue => err
+        debug_tree = buffer.buffers.collect { |b| b.debug }.join("-->")
+        puts I18n.t("unknown error on line", :line => @current_line, :row => @current_row, :tree => debug_tree)
+        raise err
+      end
+
+      buffer.eof()
+      buffer.send("to_#{self.options[:output]}")
+    end
+
+  end
+
+  class WikiBuffer::Var < WikiBuffer
+    def to_html
+      return "" if will_not_be_rendered
+
+      if self.is_function?
+        if Extension.function_exists?(function_name)
+          return Extension.functions[function_name][:klass].new(@options).instance_exec( params.collect { |p| p.strip }, &Extension.functions[function_name][:block] ).to_s
+        end
+        ret = default_functions(function_name,params.collect { |p| p.strip })
+        ret ||= @options[:link_handler].function(function_name, params.collect { |p| p.strip })
+        ret.to_s
+      elsif self.is_param?
+        ret = nil
+        @options[:buffer].buffers.reverse.each do |b|
+          ret = b.get_param(params[0],params[1]) if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+          break unless ret.nil?
+        end
+        ret.to_s
+      else
+        # put template at beginning of buffer
+        template_stack = @options[:buffer].buffers.collect { |b| b.get_param("__name") if b.instance_of?(WikiBuffer::HTMLElement) &&
+          b.element_name == "template" }.compact
+        if template_stack.last == params[0]
+          debug_tree = @options[:buffer].buffers.collect { |b| b.debug }.join("-->")
+          "<span class=\"error\">#{I18n.t('template loop detected', :tree => debug_tree)}</span>"
+        else
+          key = params[0].to_s.strip
+          key_options = params[1..].collect { |p| p.is_a?(Hash) ? { :name => p[:name].strip, :value => p[:value].strip } : p.strip }
+          key_options ||= []
+          key_digest = Digest::MD5.hexdigest(key_options.to_a.sort {|x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect)
+
+          return @options[:params][key] if @options[:params].has_key?(key)
+          # if we have a valid cache fragment use it
+          return @options[:cache][key][key_digest] unless @options[:cache].nil? || @options[:cache][key].nil? || @options[:cache][key][key_digest].nil?
+
+          ret = @options[:link_handler].include_resource(key,key_options).to_s
+
+          # This is the second patched line from:
+          # https://github.com/nricciar/wikicloth/pull/112/files#diff-f262faf4fadb222cca87185be0fb65b3f49659abc840794cc83a736d41310fb1R83
+          ret.gsub!(/<!--.*?-->/m,"") unless ret.frozen?
+
+          count = 0
+          tag_attr = key_options.collect { |p|
+            if p.instance_of?(Hash)
+              "#{p[:name]}=\"#{p[:value].gsub(/"/,'&quot;')}\""
+            else
+              count += 1
+              "#{count}=\"#{p.gsub(/"/,'&quot;')}\""
+            end
+          }.join(" ")
+
+          self.data = ret.blank? ? "" : "<template __name=\"#{key}\" __hash=\"#{key_digest}\" #{tag_attr}>#{ret}</template>"
+          ""
+        end
+      end
+    end
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren
+# rubocop:enable Layout/SpaceAroundEqualsInParameterDefault
+# rubocop:enable Style/HashSyntax
+# rubocop:enable Layout/SpaceAfterComma
+# rubocop:enable Style/RescueStandardError
+# rubocop:enable Rails/Output
+# rubocop:enable Style/MethodCallWithoutArgsParentheses
+# rubocop:enable Layout/EmptyLinesAroundClassBody
+# rubocop:enable Metrics/AbcSize
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/PerceivedComplexity
+# rubocop:enable Cop/LineBreakAroundConditionalBlock
+# rubocop:enable Layout/EmptyLineAfterGuardClause
+# rubocop:enable Performance/ReverseEach
+# rubocop:enable Style/BlockDelimiters
+# rubocop:enable Cop/LineBreakAroundConditionalBlock
+# rubocop:enable Layout/MultilineBlockLayout
+# rubocop:enable Layout/BlockEndNewline
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 1e3fd72fb55..b4ac7032df6 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -13,29 +13,32 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-  - users_viewing_analytics_group_devops_adoption
-  - i_analytics_dev_ops_adoption
-  - i_analytics_dev_ops_score
-  - p_analytics_merge_request
-  - i_analytics_instance_statistics
-  - g_analytics_contribution
-  - g_analytics_insights
-  - g_analytics_issues
-  - g_analytics_productivity
-  - g_analytics_valuestream
-  - p_analytics_pipelines
-  - p_analytics_code_reviews
-  - p_analytics_valuestream
-  - p_analytics_insights
-  - p_analytics_issues
-  - p_analytics_repo
-  - i_analytics_cohorts
+    - users_viewing_analytics_group_devops_adoption
+    - i_analytics_dev_ops_adoption
+    - i_analytics_dev_ops_score
+    - p_analytics_merge_request
+    - i_analytics_instance_statistics
+    - g_analytics_contribution
+    - g_analytics_insights
+    - g_analytics_issues
+    - g_analytics_productivity
+    - g_analytics_valuestream
+    - p_analytics_pipelines
+    - p_analytics_ci_cd_pipelines
+    - p_analytics_ci_cd_deployment_frequency
+    - p_analytics_ci_cd_lead_time
+    - p_analytics_code_reviews
+    - p_analytics_valuestream
+    - p_analytics_insights
+    - p_analytics_issues
+    - p_analytics_repo
+    - i_analytics_cohorts
 distribution:
-- ce
-- ee
+  - ce
+  - ee
 tier:
-- free
-- premium
-- ultimate
+  - free
+  - premium
+  - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: '<13.9'
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 2b43fbf8131..e5b5300dae3 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.create.merge_requests_users
 description: Distinct count of users performing merge request actions like closed, merged, created, commented
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 371da6c937b..0c1523797c0 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_builds
 description: Unique monthly builds in project
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 317548c8c24..4d9b6b2cd9c 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories in a month
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index cd9ed768ce1..976ffa0444a 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
 description: Total Monthly Pipelines from templates in repository
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index fb3992a766d..ee32c2baed9 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
 description: Distinct users triggering pipelines in a month
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index 9c2820ce851..3c35bed2ceb 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management
 description: Monthly active users for design management
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 45997bad6f2..966f3fa48a3 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts_monthly.packages
 description: A monthly count of packages published to the registry
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 84f7f6f4ba8..de5238e3e77 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.issues
 description: Count of users creating Issues in last 28 days.
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 59b6cbad145..aa3658b03bd 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.epics
 description: Count distinct author ids from epics
 product_section: dev
@@ -15,7 +15,5 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type:
-- gmau
-- paid_gmau
+performance_indicator_type: []
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 0a7d5dc82ee..5dc6c335f34 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_monthly
 description: Count of MAU changing an issue's milestone
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 24a06991d91..a8c2928caeb 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.release.deployments
 description: Unique users triggering deployments
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 87c39db5271..ea59a5be99f 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.release.releases
 description: Unique users creating release tags
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index 71b7af1eace..e8d8ad16a08 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
 description: Count of monthly active users who have performed any Git operation (read/write/push)
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index c8f45b9f926..b171deb35f0 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.jira
 description: Count of imports from Jira
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 87d78d83450..e3e7aa10c95 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
 description: Count of unique users per month who approve a merge request
 product_stage: create
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 6e944dce726..407768232a5 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index 940ef5deb65..291ee7eb149 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 0ae42fcecc0..155994cb6f8 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -7,7 +7,8 @@ product_stage: deploy
 product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index a87e1224745..7d3462cb068 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -8,7 +8,8 @@ product_stage: release
 product_group: group::release
 product_category: continuous_delivery
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index d6333260017..5b95b20f38d 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index 792d41e3bbd..6747c81367c 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index deafb216e99..9efd5df6104 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index c80a7dada11..1e3d07ed1da 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
 description: Total count of pipelines runs
 product_section: ops
@@ -49,6 +49,7 @@ options:
   - p_ci_templates_security_api_fuzzing_latest
   - p_ci_templates_security_secure_binaries
   - p_ci_templates_security_dast_api
+  - p_ci_templates_security_dast_api_latest
   - p_ci_templates_security_container_scanning
   - p_ci_templates_security_dast_latest
   - p_ci_templates_security_dependency_scanning
@@ -153,6 +154,7 @@ options:
   - p_ci_templates_implicit_security_api_fuzzing_latest
   - p_ci_templates_implicit_security_secure_binaries
   - p_ci_templates_implicit_security_dast_api
+  - p_ci_templates_implicit_security_dast_api_latest
   - p_ci_templates_implicit_security_container_scanning
   - p_ci_templates_implicit_security_dast_latest
   - p_ci_templates_implicit_security_dependency_scanning
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index be0fa6eaff7..a0dd87cd7dc 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -1,11 +1,11 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
 description: Unique users performing actions on code review events
 product_section: dev
 product_stage: devops::create
 product_group: group::code review
-product_category: 
+product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
index 3b667e49f0d..3450683aaf3 100644
--- a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
@@ -6,8 +6,9 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
+milestone_removed: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
 data_source: redis_hll
diff --git a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
index 1aa0edf60e6..928dd24b701 100644
--- a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
+++ b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
@@ -8,7 +8,7 @@ product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73762
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
new file mode 100644
index 00000000000..ce6ab2f1580
--- /dev/null
+++ b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_monthly
+description: Count of MAU using the `/add_contacts` quick action
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: service_desk
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73413
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_add_contacts
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
new file mode 100644
index 00000000000..7a544890e5a
--- /dev/null
+++ b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_monthly
+description: Count of MAU using the `/remove_contacts` quick action
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: service_desk
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73413
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_contacts
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
new file mode 100644
index 00000000000..4b9bf4120f5
--- /dev/null
+++ b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_latest_monthly
+description: Monthly counts for DAST API latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_dast_api_latest
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
new file mode 100644
index 00000000000..bd1e7a74b46
--- /dev/null
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_pipelines_monthly
+description: Count of unique visits to the project level CI CD Analytics pipelines tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
new file mode 100644
index 00000000000..54118e30127
--- /dev/null
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_deployment_frequency_monthly
+description: Count of unique visits to the project level CI CD Analytics deployment frequency tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_deployment_frequency
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
new file mode 100644
index 00000000000..9a2e194ed1a
--- /dev/null
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_lead_time_monthly
+description: Count of unique visits to the project level CI CD Analytics lead time tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_lead_time
diff --git a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
new file mode 100644
index 00000000000..f8f7f9933cf
--- /dev/null
+++ b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_expanding_testing_license_compliance_report_monthly
+description: Count of expanding the license compliance widget
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_expanding_testing_license_compliance_report
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
new file mode 100644
index 00000000000..638a64b20ce
--- /dev/null
+++ b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_visiting_testing_license_compliance_full_report_monthly
+description: Count of visiting the license compliance full report
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_visiting_testing_license_compliance_full_report
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
new file mode 100644
index 00000000000..cfcffe5caca
--- /dev/null
+++ b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_latest_monthly
+description: Monthly counts for DAST API latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "14.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_dast_api_latest
diff --git a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
new file mode 100644
index 00000000000..81b728a5ebd
--- /dev/null
+++ b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_visiting_testing_manage_license_compliance_monthly
+description: Count of visiting the manage license compliance page
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_visiting_testing_manage_license_compliance
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 3a9efa3f962..4efbc3f14de 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -13,29 +13,32 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-  - users_viewing_analytics_group_devops_adoption
-  - i_analytics_dev_ops_adoption
-  - i_analytics_dev_ops_score
-  - p_analytics_merge_request
-  - i_analytics_instance_statistics
-  - g_analytics_contribution
-  - g_analytics_insights
-  - g_analytics_issues
-  - g_analytics_productivity
-  - g_analytics_valuestream
-  - p_analytics_pipelines
-  - p_analytics_code_reviews
-  - p_analytics_valuestream
-  - p_analytics_insights
-  - p_analytics_issues
-  - p_analytics_repo
-  - i_analytics_cohorts
+    - users_viewing_analytics_group_devops_adoption
+    - i_analytics_dev_ops_adoption
+    - i_analytics_dev_ops_score
+    - p_analytics_merge_request
+    - i_analytics_instance_statistics
+    - g_analytics_contribution
+    - g_analytics_insights
+    - g_analytics_issues
+    - g_analytics_productivity
+    - g_analytics_valuestream
+    - p_analytics_pipelines
+    - p_analytics_ci_cd_pipelines
+    - p_analytics_ci_cd_deployment_frequency
+    - p_analytics_ci_cd_lead_time
+    - p_analytics_code_reviews
+    - p_analytics_valuestream
+    - p_analytics_insights
+    - p_analytics_issues
+    - p_analytics_repo
+    - i_analytics_cohorts
 distribution:
-- ce
-- ee
+  - ce
+  - ee
 tier:
-- free
-- premium
-- ultimate
+  - free
+  - premium
+  - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: '<13.9'
diff --git a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index fbfb93ded5a..9bec574722c 100644
--- a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index 0b05e776c70..ec176ce689c 100644
--- a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 45fe5e380f5..050ad56eb91 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -7,7 +7,8 @@ product_stage: deploy
 product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index adc12342146..0477d58a5d8 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -8,7 +8,8 @@ product_stage: release
 product_group: group::release
 product_category: continuous_delivery
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index b01a0288228..b06a4fa5577 100644
--- a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -7,8 +7,9 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
+milestone_removed: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
 data_source: redis_hll
diff --git a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 59f9f25aa06..d7278e2dd34 100644
--- a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -7,7 +7,8 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.6'
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 31813735ea4..8d545b91d1f 100644
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -49,6 +49,7 @@ options:
   - p_ci_templates_security_api_fuzzing_latest
   - p_ci_templates_security_secure_binaries
   - p_ci_templates_security_dast_api
+  - p_ci_templates_security_dast_api_latest
   - p_ci_templates_security_container_scanning
   - p_ci_templates_security_dast_latest
   - p_ci_templates_security_dependency_scanning
@@ -153,6 +154,7 @@ options:
   - p_ci_templates_implicit_security_api_fuzzing_latest
   - p_ci_templates_implicit_security_secure_binaries
   - p_ci_templates_implicit_security_dast_api
+  - p_ci_templates_implicit_security_dast_api_latest
   - p_ci_templates_implicit_security_container_scanning
   - p_ci_templates_implicit_security_dast_latest
   - p_ci_templates_implicit_security_dependency_scanning
diff --git a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
index 7f674324a31..beb82977e3f 100644
--- a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
@@ -6,8 +6,9 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
+milestone_removed: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
 data_source: redis_hll
diff --git a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
index 9f8ae151a80..3a647c52f71 100644
--- a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
+++ b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
@@ -8,7 +8,7 @@ product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73762
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
new file mode 100644
index 00000000000..356d969cea5
--- /dev/null
+++ b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_weekly
+description: Count of WAU using the `/add_contacts` quick action
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: service_desk
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73413
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_add_contacts
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
new file mode 100644
index 00000000000..7a660ddffd2
--- /dev/null
+++ b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_weekly
+description: Count of WAU using the `/remove_contacts` quick action
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: service_desk
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73413
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_contacts
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
new file mode 100644
index 00000000000..8d0415dedd2
--- /dev/null
+++ b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_latest_weekly
+description: Weekly counts for DAST API latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_dast_api_latest
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
new file mode 100644
index 00000000000..e77af4df59a
--- /dev/null
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_pipelines_weekly
+description: Count of unique visits to the project level CI CD Analytics pipelines tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
new file mode 100644
index 00000000000..d2181a95876
--- /dev/null
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_deployment_frequency_weekly
+description: Count of unique visits to the project level CI CD Analytics deployment frequency tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_deployment_frequency
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
new file mode 100644
index 00000000000..8d11cc16fcc
--- /dev/null
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_lead_time_weekly
+description: Count of unique visits to the project level CI CD Analytics lead time tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_analytics_ci_cd_lead_time
diff --git a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
new file mode 100644
index 00000000000..b96d0fff1bd
--- /dev/null
+++ b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_expanding_testing_license_compliance_report_weekly
+description: Count of expanding the license compliance widget
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_expanding_testing_license_compliance_report
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
new file mode 100644
index 00000000000..4a6ee19fffe
--- /dev/null
+++ b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_visiting_testing_license_compliance_full_report_weekly
+description: Count of visiting the license compliance full report
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_visiting_testing_license_compliance_full_report
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
new file mode 100644
index 00000000000..1d4f024b361
--- /dev/null
+++ b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_latest_weekly
+description: Weekly counts for DAST API latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "14.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_dast_api_latest
diff --git a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
new file mode 100644
index 00000000000..9bff8263121
--- /dev/null
+++ b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.testing.users_visiting_testing_manage_license_compliance_weekly
+description: Count of visiting the manage license compliance page
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75643
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options: 
+  events: 
+    - users_visiting_testing_manage_license_compliance
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 0a26577ae8d..85870f728bb 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.auto_devops_enabled
 description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps
   enabled and Auto DevOps template includes)
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index e402391f9ba..b3fa3f2678b 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.ci_runners
 description: Total configured Runners of all types
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 0a5e5ff0269..70b1c4138be 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage.verify.ci_pipelines
 description: Distinct Users triggering Total pipelines
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index e26cae87f95..554ed451d64 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.projects_with_packages
 description: Projects with package registry enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 4e2d402e9e1..b2b19dfcf17 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.commit_comment
 description: Count of total unique commit comments. Does not include MR diff comments
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index aa5c55ec3e7..9930105d8cf 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.source_code_pushes
 description: Count of total Git push operations
 product_section: dev
diff --git a/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml
new file mode 100644
index 00000000000..7e6820b0d24
--- /dev/null
+++ b/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: analytics_unique_visits.p_analytics_ci_cd_pipelines
+description: Count of unique visits to the project level CI CD Analytics pipelines tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: all
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
new file mode 100644
index 00000000000..134f43b1b27
--- /dev/null
+++ b/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: analytics_unique_visits.p_analytics_ci_cd_deployment_frequency
+description: Count of unique visits to the project level CI CD Analytics deployment frequency tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: all
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml
new file mode 100644
index 00000000000..a167a380432
--- /dev/null
+++ b/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: analytics_unique_visits.p_analytics_ci_cd_lead_time
+description: Count of unique visits to the project level CI CD Analytics lead time tab
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+milestone: '14.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
+time_frame: all
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 5e498ceb6c4..878134574e2 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
 product_section: ops
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 5b886288fec..f0bcf95871a 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: instance_auto_devops_enabled
 description: Whether auto DevOps is enabled
 product_section: ops
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index c65d1934c61..1fdee829b84 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: container_registry_enabled
 description: A count of projects where the container registry is enabled
 product_section: ops
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 6b5719d284d..c58b3a8c8d5 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: gitlab_shared_runners_enabled
 description: Whether shared runners is enabled
 product_section: ops
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 1d13b72fbff..5b1447a58e8 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: prometheus_metrics_enabled
 description: Whether Prometheus Metrics endpoint is enabled
 product_section: growth
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 28e12d85e41..e267bd7109b 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
 product_section: ops
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index c1e8869d9a6..9411f1cacf8 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: object_store.packages.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml
new file mode 100644
index 00000000000..ae947115704
--- /dev/null
+++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml
@@ -0,0 +1,24 @@
+---
+key_path: settings.snowplow_enabled
+name: snowplow_enabled_gitlab_instance
+description: Whether snowplow is enabled for the GitLab instance
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: product intelligence
+value_type: boolean
+status: active
+milestone: "14.6"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75184'
+time_frame: none
+data_source: system
+instrumentation_class: SnowplowEnabledMetric
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
new file mode 100644
index 00000000000..4dff0b2af2f
--- /dev/null
+++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
@@ -0,0 +1,24 @@
+---
+key_path: settings.snowplow_configured_to_gitlab_collector
+name: snowplow_configured_to_gitlab_collector
+description: Metric informs if currently configured Snowplow collector hostname points towards Gitlab Snowplow collection pipeline.
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: product intelligence
+value_type: boolean
+status: active
+milestone: "14.6"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75184'
+time_frame: none
+data_source: system
+instrumentation_class: SnowplowConfiguredToGitlabCollectorMetric
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/routes.rb b/config/routes.rb
index 94d36961b32..b02c1380c7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,6 +72,7 @@ Rails.application.routes.draw do
       resources :groups_projects, only: [:new, :create] do
         post :import, on: :collection
       end
+      draw :verification
     end
   end
 
@@ -145,7 +146,7 @@ Rails.application.routes.draw do
     get 'acme-challenge/' => 'acme_challenges#show'
 
     # UserCallouts
-    resources :user_callouts, only: [:create]
+    resources :user_callouts, controller: 'users/callouts', only: [:create] # remove after 14.6 2021-12-22 to handle mixed deployments
 
     scope :ide, as: :ide, format: false do
       get '/', to: 'ide#index'
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index dac1937b76a..7f19f6b8427 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -186,4 +186,6 @@ namespace :admin do
   get '/dashboard/stats', to: 'dashboard#stats'
 
   root to: 'dashboard#index'
+
+  get :version_check, to: 'version_check#version_check'
 end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 9a50d580747..da205163e6d 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -126,11 +126,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       end
     end
 
-    resources :crm, only: [] do
-      collection do
-        get 'contacts'
-        get 'organizations'
-      end
+    namespace :crm do
+      resources :contacts, only: [:index, :new, :edit]
+      resources :organizations, only: [:index, :new]
     end
   end
 
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index 3eda53318e3..b8d4a0c49c2 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -22,7 +22,14 @@ resource :profile, only: [:show, :update] do
     end
 
     resource :notifications, only: [:show, :update] do
-      resources :groups, only: :update, constraints: { id: Gitlab::PathRegex.full_namespace_route_regex }
+      scope(path: 'groups/*id',
+        id: Gitlab::PathRegex.full_namespace_route_regex,
+        as: :group,
+        controller: :groups,
+        constraints: { format: /(html|json)/ }) do
+        patch '/', action: :update
+        put '/', action: :update
+      end
     end
 
     resource :password, only: [:new, :create, :edit, :update] do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 7f9b2cc4fbf..5f1b35d67c0 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -317,6 +317,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :google_cloud, only: [:index]
 
+        namespace :google_cloud do
+          resources :service_accounts, only: [:index, :create]
+        end
+
         resources :environments, except: [:destroy] do
           member do
             post :stop
@@ -453,6 +457,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
         end
+
+        namespace :integrations do
+          resource :shimo, only: [:show]
+        end
       end
       # End of the /-/ scope.
 
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 01de59c3357..64dc56e18ec 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -61,6 +61,7 @@ scope '-/users', module: :users do
     post :decline, on: :member
   end
 
+  resources :callouts, only: [:create]
   resources :group_callouts, only: [:create]
 end
 
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index f7e3f036c53..49989e022fa 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -73,6 +73,8 @@
   - 1
 - - ci_delete_objects
   - 1
+- - ci_upstream_projects_subscriptions_cleanup
+  - 1
 - - container_repository
   - 1
 - - create_commit_signature
@@ -203,6 +205,8 @@
   - 1
 - - incident_management_pending_escalations_alert_create
   - 1
+- - incident_management_pending_escalations_issue_check
+  - 1
 - - integrations_create_external_cross_reference
   - 1
 - - invalid_gpg_signature_update
@@ -269,6 +273,8 @@
   - 1
 - - namespaces_onboarding_user_added
   - 1
+- - namespaces_process_sync_events
+  - 1
 - - namespaces_sync_namespace_name
   - 1
 - - new_epic
@@ -335,6 +341,8 @@
   - 1
 - - projects_post_creation
   - 1
+- - projects_process_sync_events
+  - 1
 - - projects_schedule_bulk_repository_shard_moves
   - 1
 - - projects_update_repository_storage
@@ -351,8 +359,6 @@
   - 1
 - - propagate_integration_project
   - 1
-- - propagate_service_template
-  - 1
 - - reactive_caching
   - 1
 - - rebase
diff --git a/config/webpack.config.js b/config/webpack.config.js
index f334e17bbaf..7eaa11d9346 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -163,6 +163,9 @@ const alias = {
   // the following resolves files which are different between CE and JH
   jh_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'),
 
+  // the following resolves files which are different between CE/EE/JH
+  any_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'),
+
   // override loader path for icons.svg so we do not duplicate this asset
   '@gitlab/svgs/dist/icons.svg': path.join(
     ROOT_PATH,
@@ -179,6 +182,8 @@ if (IS_EE) {
     ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
     ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'),
     ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
+    jh_else_ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
+    any_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
   });
 }
 
@@ -190,7 +195,10 @@ if (IS_JH) {
     jh_icons: path.join(ROOT_PATH, 'jh/app/views/shared/icons'),
     jh_images: path.join(ROOT_PATH, 'jh/app/assets/images'),
     jh_jest: path.join(ROOT_PATH, 'jh/spec/frontend'),
+    // jh path alias https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305#note_732793956
     jh_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
+    jh_else_ee: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
+    any_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
   });
 }