Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

author: GitLab Bot <gitlab-bot@gitlab.com> 2022-03-18 20:02:30 +0000
committer: GitLab Bot <gitlab-bot@gitlab.com> 2022-03-18 20:02:30 +0000
commit: 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch)
tree: 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /config
parent: 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff)
download: gitlab-ce-41fe97390ceddf945f3d967b8fdb3de4c66b7dea.tar.gz
163 files changed, 1192 insertions, 647 deletions
diff --git a/config/application.rb b/config/application.rb
index 8d795e6bc4e..76541daa9e1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,6 +18,8 @@ module Gitlab
   class Application < Rails::Application
     config.load_defaults 6.1
 
+    config.view_component.preview_route = "/-/view_component/previews"
+
     # This section contains configuration from Rails upgrades to override the new defaults so that we
     # keep existing behavior.
     #
@@ -247,6 +249,7 @@ module Gitlab
     config.assets.precompile << "mailer.css"
     config.assets.precompile << "mailer_client_specific.css"
     config.assets.precompile << "notify.css"
+    config.assets.precompile << "notify_enhanced.css"
     config.assets.precompile << "mailers/*.css"
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
     config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql
index 729d8447077..23c7f052f5a 100644
--- a/config/database.yml.decomposed-postgresql
+++ b/config/database.yml.decomposed-postgresql
@@ -1,4 +1,22 @@
 #
+# PRODUCTION
+#
+production:
+  main:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_production
+    username: git
+    password: "secure password"
+    host: localhost
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_production_ci
+    username: git
+    password: "secure password"
+    host: localhost
+#
 # Development specific
 #
 development:
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 894e60b61f2..22dd75fc64d 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -362,3 +362,9 @@
 - - :approve
   - 0.0.62
   - *2
+- - :approve
+  - argparse
+  - :who: Lukas Eipert
+    :why: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79864#note_845406018
+    :versions: [2.0.1]
+    :when: 2022-02-24 10:44:26.669326000 Z
diff --git a/config/events/1647273260_projectsclustersindex_open_modal.yml b/config/events/1647273260_projectsclustersindex_open_modal.yml
new file mode 100644
index 00000000000..065a99e78ef
--- /dev/null
+++ b/config/events/1647273260_projectsclustersindex_open_modal.yml
@@ -0,0 +1,18 @@
+---
+description: Create token modal opened from the agent's page
+category: default
+action: open_modal
+label_description: agent_token_creation_modal
+product_section: ops
+product_stage: configure
+product_group: group::configure
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82690
+distributions:
+- ce
+- ee
+tiers: 
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1647273493_projectsclustersindex_click_button.yml b/config/events/1647273493_projectsclustersindex_click_button.yml
new file mode 100644
index 00000000000..2dabfba8204
--- /dev/null
+++ b/config/events/1647273493_projectsclustersindex_click_button.yml
@@ -0,0 +1,19 @@
+---
+description: Button clicked within the create token modal on the agent's page
+category: default
+action: click_button
+label_description: agent_token_creation_modal
+property_description: One of "create-token", "close"
+product_section: ops
+product_stage: configure
+product_group: group::configure
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82690
+distributions:
+- ce
+- ee
+tiers: 
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml b/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml
deleted file mode 100644
index 7ce1a3d9b76..00000000000
--- a/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit CI file dismissed"
-category: "`code_quality_walkthrough`"
-action: commit_ci_file_dismissed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml b/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml
deleted file mode 100644
index 4fbece2fef8..00000000000
--- a/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit CI file displayed"
-category: "`code_quality_walkthrough`"
-action: commit_ci_file_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205052_code_quality_walkthrough_commit_created.yml b/config/events/20210915205052_code_quality_walkthrough_commit_created.yml
deleted file mode 100644
index 5e8d8a1250a..00000000000
--- a/config/events/20210915205052_code_quality_walkthrough_commit_created.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit created"
-category: "`code_quality_walkthrough`"
-action: commit_created
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml b/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml
deleted file mode 100644
index 684bb681045..00000000000
--- a/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Click empty state CTA"
-category: "`code_quality_walkthrough`"
-action: cta_clicked
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml b/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml
deleted file mode 100644
index 517da8eac13..00000000000
--- a/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show failed pipeline"
-category: "`code_quality_walkthrough`"
-action: failed_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml b/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml
deleted file mode 100644
index adb4400f288..00000000000
--- a/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show failed pipeline logs"
-category: "`code_quality_walkthrough`"
-action: failed_pipeline_view_logs
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml b/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml
deleted file mode 100644
index 7fcff9644f4..00000000000
--- a/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Dismiss running pipeline"
-category: "`code_quality_walkthrough`"
-action: running_pipeline_dismissed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml b/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml
deleted file mode 100644
index b7faa132d8b..00000000000
--- a/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show running pipeline"
-category: "`code_quality_walkthrough`"
-action: running_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml b/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml
deleted file mode 100644
index d5909cdab89..00000000000
--- a/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show succeeded pipeline"
-category: "`code_quality_walkthrough`"
-action: success_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml b/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml
deleted file mode 100644
index 253bf3c3577..00000000000
--- a/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show succeeded pipeline logs"
-category: "`code_quality_walkthrough`"
-action: success_pipeline_view_logs
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 00b213d307b..c422d2da691 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -31,6 +31,7 @@
 - continuous_delivery
 - continuous_integration
 - continuous_integration_scaling
+- continuous_verification
 - database
 - dataops
 - delivery
@@ -74,7 +75,6 @@
 - kubernetes_management
 - license
 - license_compliance
-- live_preview
 - logging
 - memory
 - merge_trains
@@ -110,7 +110,6 @@
 - secrets_management
 - security_benchmarking
 - security_orchestration
-- self_monitoring
 - service_desk
 - service_ping
 - sharding
@@ -119,7 +118,6 @@
 - static_application_security_testing
 - static_site_editor
 - subgroups
-- synthetic_monitoring
 - team_planning
 - tracing
 - usage_ping
diff --git a/config/feature_flags/development/broadcast_issue_updates.yml b/config/feature_flags/development/broadcast_issue_updates.yml
deleted file mode 100644
index c38263528a9..00000000000
--- a/config/feature_flags/development/broadcast_issue_updates.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: broadcast_issue_updates
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30732
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/3413
-milestone: '13.0'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/cache_shared_runners_enabled.yml b/config/feature_flags/development/cache_shared_runners_enabled.yml
deleted file mode 100644
index 4dde6c852a6..00000000000
--- a/config/feature_flags/development/cache_shared_runners_enabled.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: cache_shared_runners_enabled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68002
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338267
-milestone: '14.2'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml b/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml
deleted file mode 100644
index 3c7204f444b..00000000000
--- a/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_drop_cyclical_triggered_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/1195
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329390
-milestone: '13.12'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase1_allow.yml b/config/feature_flags/development/ci_fix_order_of_subsequent_jobs.yml
index 1e8d260c93b..9a98604d0a8 100644
--- a/config/feature_flags/development/container_registry_migration_phase1_allow.yml
+++ b/config/feature_flags/development/ci_fix_order_of_subsequent_jobs.yml
@@ -1,8 +1,8 @@
 ---
-name: container_registry_migration_phase1_allow
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63907
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335705
-milestone: '14.1'
+name: ci_fix_order_of_subsequent_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74394
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345587
+milestone: '14.9'
 type: development
-group: group::package
+group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
index 3a5ec00c32d..51c9fd21564 100644
--- a/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
+++ b/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
@@ -1,7 +1,7 @@
 ---
 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
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
 milestone: '14.6'
 type: development
 group: group::pipeline execution
diff --git a/config/feature_flags/development/ci_pending_builds_queue_source.yml b/config/feature_flags/development/ci_pending_builds_queue_source.yml
index f6edd0e98ea..5fc2fcdb77a 100644
--- a/config/feature_flags/development/ci_pending_builds_queue_source.yml
+++ b/config/feature_flags/development/ci_pending_builds_queue_source.yml
@@ -1,8 +1,8 @@
 ---
 name: ci_pending_builds_queue_source
 introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350884
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
 milestone: '14.0'
 type: development
 group: group::pipeline execution
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_merge_request_presence_check.yml b/config/feature_flags/development/ci_pipeline_merge_request_presence_check.yml
deleted file mode 100644
index 19f674aa27c..00000000000
--- a/config/feature_flags/development/ci_pipeline_merge_request_presence_check.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pipeline_merge_request_presence_check
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78574
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350734
-milestone: '14.8'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml b/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
index 53515ddab5a..43c7c8e7c2a 100644
--- a/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
+++ b/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
@@ -1,7 +1,7 @@
 ---
 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
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
 milestone: '14.6'
 type: development
 group: group::pipeline execution
diff --git a/config/feature_flags/development/ci_trigger_forward_variables.yml b/config/feature_flags/development/ci_trigger_forward_variables.yml
new file mode 100644
index 00000000000..34e418599b4
--- /dev/null
+++ b/config/feature_flags/development/ci_trigger_forward_variables.yml
@@ -0,0 +1,8 @@
+---
+name: ci_trigger_forward_variables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82676
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355572
+milestone: '14.9'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_expiration_policies_throttling.yml b/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
index f9aa6bde700..e22c7c3177b 100644
--- a/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
+++ b/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238190
 milestone: '13.4'
 type: development
 group: group::package
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/cluster_vulnerabilities.yml b/config/feature_flags/development/container_registry_follow_redirects_middleware.yml
index 9d7f3228d66..6b0ded9dbc4 100644
--- a/config/feature_flags/development/cluster_vulnerabilities.yml
+++ b/config/feature_flags/development/container_registry_follow_redirects_middleware.yml
@@ -1,8 +1,8 @@
 ---
-name: cluster_vulnerabilities
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73321
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343917
-milestone: '14.5'
+name: container_registry_follow_redirects_middleware
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81056
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353291
+milestone: '14.9'
 type: development
-group: group::container security
+group: group::package
 default_enabled: true
diff --git a/config/feature_flags/development/container_registry_migration_phase1_deny.yml b/config/feature_flags/development/container_registry_migration_phase1_deny.yml
deleted file mode 100644
index 1aa66059045..00000000000
--- a/config/feature_flags/development/container_registry_migration_phase1_deny.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: container_registry_migration_phase1_deny
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63907
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335706
-milestone: '14.1'
-type: development
-group: group::package
-default_enabled: false
diff --git a/config/feature_flags/development/create_project_namespace_on_project_create.yml b/config/feature_flags/development/create_project_namespace_on_project_create.yml
deleted file mode 100644
index 0d6ea8b2784..00000000000
--- a/config/feature_flags/development/create_project_namespace_on_project_create.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: create_project_namespace_on_project_create
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70972
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344954
-milestone: '14.5'
-type: development
-group: group::workspace
-default_enabled: true
diff --git a/config/feature_flags/development/default_merge_ref_for_diffs.yml b/config/feature_flags/development/default_merge_ref_for_diffs.yml
deleted file mode 100644
index f197044d47f..00000000000
--- a/config/feature_flags/development/default_merge_ref_for_diffs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: default_merge_ref_for_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34472
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276917
-milestone: '13.4'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/web_ide_primary_edit.yml b/config/feature_flags/development/disable_unsafe_regexp.yml
index 5a609ae1d88..196b647082e 100644
--- a/config/feature_flags/development/web_ide_primary_edit.yml
+++ b/config/feature_flags/development/disable_unsafe_regexp.yml
@@ -1,8 +1,8 @@
 ---
-name: web_ide_primary_edit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35957
+name: disable_unsafe_regexp
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79611
 rollout_issue_url: 
-milestone: '13.3'
+milestone: '14.9'
 type: development
-group: group::editor
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/generic_packages.yml b/config/feature_flags/development/dispensable_render.yml
index b2ab35c713c..6f1689b325a 100644
--- a/config/feature_flags/development/generic_packages.yml
+++ b/config/feature_flags/development/dispensable_render.yml
@@ -1,8 +1,8 @@
 ---
-name: generic_packages
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40045
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239133
-milestone: '13.4'
+name: dispensable_render
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81546
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354337
+milestone: '14.9'
 type: development
-group: group::release
+group: group::activation
 default_enabled: true
diff --git a/config/feature_flags/development/allow_unsafe_ruby_regexp.yml b/config/feature_flags/development/enable_new_sentry_integration.yml
index 029b1454ea4..00665f80ed6 100644
--- a/config/feature_flags/development/allow_unsafe_ruby_regexp.yml
+++ b/config/feature_flags/development/enable_new_sentry_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: allow_unsafe_ruby_regexp
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/10566
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257849
-milestone: '11.10'
+name: enable_new_sentry_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72428
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344832
+milestone: '14.9'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/rearrange_pipelines_table.yml b/config/feature_flags/development/enable_old_sentry_integration.yml
index 4f16d6651b6..4911dbfdc78 100644
--- a/config/feature_flags/development/rearrange_pipelines_table.yml
+++ b/config/feature_flags/development/enable_old_sentry_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: rearrange_pipelines_table
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72545
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343286
-milestone: '14.8'
+name: enable_old_sentry_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72428
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344832
+milestone: '14.9'
 type: development
 group: group::pipeline execution
 default_enabled: true
diff --git a/config/feature_flags/development/enhanced_notify_css.yml b/config/feature_flags/development/enhanced_notify_css.yml
new file mode 100644
index 00000000000..e47db3ba435
--- /dev/null
+++ b/config/feature_flags/development/enhanced_notify_css.yml
@@ -0,0 +1,8 @@
+---
+name: enhanced_notify_css
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78604
+rollout_issue_url:
+milestone: '14.8'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/sync_traversal_ids_before_commit.yml b/config/feature_flags/development/exit_registration_verification.yml
index f8f1e854fa5..c544ebc2943 100644
--- a/config/feature_flags/development/sync_traversal_ids_before_commit.yml
+++ b/config/feature_flags/development/exit_registration_verification.yml
@@ -1,8 +1,8 @@
 ---
-name: sync_traversal_ids_before_commit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79964
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352499
-group: group::workspace
+name: exit_registration_verification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80286
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352397
+milestone: '14.8'
 type: development
+group: group::activation
 default_enabled: false
-milestone: '14.8'
diff --git a/config/feature_flags/development/geo_token_user_authentication.yml b/config/feature_flags/development/geo_token_user_authentication.yml
index 779e9b92351..aab95c93312 100644
--- a/config/feature_flags/development/geo_token_user_authentication.yml
+++ b/config/feature_flags/development/geo_token_user_authentication.yml
@@ -1,8 +1,8 @@
 ---
 name: geo_token_user_authentication
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79431
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351450
 milestone: '14.8'
 type: development
 group: group::geo
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml b/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml
new file mode 100644
index 00000000000..a3fee67a7f6
--- /dev/null
+++ b/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml
@@ -0,0 +1,8 @@
+---
+name: gl_avatar_for_all_user_avatars
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81437
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353477
+milestone: '14.9'
+type: development
+group: group::foundations
+default_enabled: false
diff --git a/config/feature_flags/development/group_releases_finder_inoperator.yml b/config/feature_flags/development/group_releases_finder_inoperator.yml
new file mode 100644
index 00000000000..c76c328b5bf
--- /dev/null
+++ b/config/feature_flags/development/group_releases_finder_inoperator.yml
@@ -0,0 +1,8 @@
+---
+name: group_releases_finder_inoperator
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80093
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355463
+milestone: '14.9'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_migration_phase1.yml b/config/feature_flags/development/harbor_registry_integration.yml
index 85fbdcfab01..84d9709ca30 100644
--- a/config/feature_flags/development/container_registry_migration_phase1.yml
+++ b/config/feature_flags/development/harbor_registry_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: container_registry_migration_phase1
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63907
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335703
-milestone: '14.1'
+name: harbor_registry_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81593
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353595
+milestone: '14.9'
 type: development
 group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/header_read_timeout_buffered_io.yml b/config/feature_flags/development/header_read_timeout_buffered_io.yml
index 552052e2d9b..ba7ef4cc000 100644
--- a/config/feature_flags/development/header_read_timeout_buffered_io.yml
+++ b/config/feature_flags/development/header_read_timeout_buffered_io.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350233
 milestone: '14.8'
 type: development
 group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/load_balancing_for_export_workers.yml b/config/feature_flags/development/import_project_from_remote_file_s3.yml
index 04ebd8b4a04..c7d52202726 100644
--- a/config/feature_flags/development/load_balancing_for_export_workers.yml
+++ b/config/feature_flags/development/import_project_from_remote_file_s3.yml
@@ -1,8 +1,8 @@
 ---
-name: load_balancing_for_export_workers
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68153
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338615
-milestone: '14.2'
+name: import_project_from_remote_file_s3
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77259
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350571
+milestone: '14.9'
 type: development
 group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/import_relation_object_persistence.yml b/config/feature_flags/development/import_relation_object_persistence.yml
new file mode 100644
index 00000000000..e182ea31a72
--- /dev/null
+++ b/config/feature_flags/development/import_relation_object_persistence.yml
@@ -0,0 +1,8 @@
+---
+name: import_relation_object_persistence
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79963
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354497
+milestone: '14.9'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/track_highlight_timeouts.yml b/config/feature_flags/development/incident_timeline_event_tab.yml
index a85749e5187..01dd9276007 100644
--- a/config/feature_flags/development/track_highlight_timeouts.yml
+++ b/config/feature_flags/development/incident_timeline_event_tab.yml
@@ -1,8 +1,8 @@
 ---
-name: track_highlight_timeouts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60956
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329909
-milestone: '13.12'
+name: incident_timeline_event_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80802
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353426
+milestone: '14.9'
 type: development
-group: group::code review
+group: group::respond
 default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_user_by_id_endpoint.yml b/config/feature_flags/development/incremental_repository_backup.yml
index d5523b7541b..d9eb97ba327 100644
--- a/config/feature_flags/development/rate_limit_user_by_id_endpoint.yml
+++ b/config/feature_flags/development/incremental_repository_backup.yml
@@ -1,8 +1,8 @@
 ---
-name: rate_limit_user_by_id_endpoint
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73069
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348796
-milestone: '14.6'
+name: incremental_repository_backup
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79589
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355945
+milestone: '14.9'
 type: development
-group: group::optimize
+group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/integrated_error_tracking.yml b/config/feature_flags/development/integrated_error_tracking.yml
new file mode 100644
index 00000000000..fb302daed57
--- /dev/null
+++ b/config/feature_flags/development/integrated_error_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: integrated_error_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81767
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353956
+milestone: '14.9'
+type: development
+group: group::respond
+default_enabled: false
diff --git a/config/feature_flags/development/display_outdated_line_diff.yml b/config/feature_flags/development/integration_form_sections.yml
index 979575da381..bb03174d2fd 100644
--- a/config/feature_flags/development/display_outdated_line_diff.yml
+++ b/config/feature_flags/development/integration_form_sections.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: https://gitlab.com/gitlab-org/gitlab/-/issues/345491
-milestone: '14.5'
+name: integration_form_sections
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80712
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352827
+milestone: '14.9'
 type: development
-group: group::code review
+group: group::integrations
 default_enabled: true
diff --git a/config/feature_flags/development/invite_members_group_modal.yml b/config/feature_flags/development/invite_members_group_modal.yml
deleted file mode 100644
index ab28a2c6e24..00000000000
--- a/config/feature_flags/development/invite_members_group_modal.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_group_modal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37906
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247208
-milestone: '13.5'
-type: development
-group: group::expansion
-default_enabled: true
diff --git a/config/feature_flags/development/issue_boards_filtered_search.yml b/config/feature_flags/development/issue_boards_filtered_search.yml
deleted file mode 100644
index dadbbd1b2fc..00000000000
--- a/config/feature_flags/development/issue_boards_filtered_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: issue_boards_filtered_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61752
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331649
-milestone: '14.1'
-type: development
-group: group::product planning
-default_enabled: true
diff --git a/config/feature_flags/development/rate_limited_service_issues_create.yml b/config/feature_flags/development/issues_full_text_search.yml
index 95ece10aa6c..354dbede75f 100644
--- a/config/feature_flags/development/rate_limited_service_issues_create.yml
+++ b/config/feature_flags/development/issues_full_text_search.yml
@@ -1,8 +1,8 @@
 ---
-name: rate_limited_service_issues_create
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68526
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342677
-milestone: '14.4'
+name: issues_full_text_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71913
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354784
+milestone: '14.5'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/iteration_cadences.yml b/config/feature_flags/development/iteration_cadences.yml
index 2a496449a6a..c90743020d6 100644
--- a/config/feature_flags/development/iteration_cadences.yml
+++ b/config/feature_flags/development/iteration_cadences.yml
@@ -1,7 +1,7 @@
 ---
 name: iteration_cadences
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54822
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354878
 milestone: '13.10'
 type: development
 group: group::project management
diff --git a/config/feature_flags/development/chat_notification_deployment_protected_branch_filter.yml b/config/feature_flags/development/jira_connect_installation_update.yml
index 0b81a06c593..a92a7dafc14 100644
--- a/config/feature_flags/development/chat_notification_deployment_protected_branch_filter.yml
+++ b/config/feature_flags/development/jira_connect_installation_update.yml
@@ -1,8 +1,8 @@
 ---
-name: chat_notification_deployment_protected_branch_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74423
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349131
-milestone: '14.7'
+name: jira_connect_installation_update
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83038
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356083
+milestone: '14.9'
 type: development
 group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_oauth.yml b/config/feature_flags/development/jira_connect_oauth.yml
new file mode 100644
index 00000000000..2f090d56bd1
--- /dev/null
+++ b/config/feature_flags/development/jira_connect_oauth.yml
@@ -0,0 +1,8 @@
+---
+name: jira_connect_oauth
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81126
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355048
+milestone: '14.9'
+type: development
+group: group::integrations
+default_enabled: false
diff --git a/config/feature_flags/development/update_all_mirrors_job_tracker.yml b/config/feature_flags/development/job_deployment_count.yml
index 507f32550c3..9a101da9a99 100644
--- a/config/feature_flags/development/update_all_mirrors_job_tracker.yml
+++ b/config/feature_flags/development/job_deployment_count.yml
@@ -1,8 +1,8 @@
 ---
-name: update_all_mirrors_job_tracker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79097
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351420
+name: job_deployment_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79272
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351591
 milestone: '14.8'
 type: development
-group: group::scalability
+group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/jobs_tab_vue.yml b/config/feature_flags/development/jobs_tab_vue.yml
deleted file mode 100644
index d6e797f66a5..00000000000
--- a/config/feature_flags/development/jobs_tab_vue.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-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: true
diff --git a/config/feature_flags/development/lfk_automatic_partition_creation.yml b/config/feature_flags/development/lfk_automatic_partition_creation.yml
index 72678ff9cbf..5eb50d36f27 100644
--- a/config/feature_flags/development/lfk_automatic_partition_creation.yml
+++ b/config/feature_flags/development/lfk_automatic_partition_creation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346907
 milestone: '14.6'
 type: development
 group: group::sharding
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/lfk_automatic_partition_dropping.yml b/config/feature_flags/development/lfk_automatic_partition_dropping.yml
index 5b908a3309e..a45d6b8f346 100644
--- a/config/feature_flags/development/lfk_automatic_partition_dropping.yml
+++ b/config/feature_flags/development/lfk_automatic_partition_dropping.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346908
 milestone: '14.6'
 type: development
 group: group::sharding
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/lfk_fair_queueing.yml b/config/feature_flags/development/lfk_fair_queueing.yml
index ac67ffa14f0..6dc6cb72e56 100644
--- a/config/feature_flags/development/lfk_fair_queueing.yml
+++ b/config/feature_flags/development/lfk_fair_queueing.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351082
 milestone: '14.8'
 type: development
 group: group::sharding
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/roadmap_settings.yml b/config/feature_flags/development/merge_service_ping_instrumented_metrics.yml
index 78704a90d06..4a19544bb9f 100644
--- a/config/feature_flags/development/roadmap_settings.yml
+++ b/config/feature_flags/development/merge_service_ping_instrumented_metrics.yml
@@ -1,8 +1,8 @@
 ---
-name: roadmap_settings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78626
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350830
+name: merge_service_ping_instrumented_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77629
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352964
 milestone: '14.8'
 type: development
-group: group::product planning
+group: group::product intelligence
 default_enabled: true
diff --git a/config/feature_flags/development/group_project_api_preload_plans.yml b/config/feature_flags/development/namespaces_cache_first_auto_devops_config.yml
index 3854bed461a..6d15df2bb91 100644
--- a/config/feature_flags/development/group_project_api_preload_plans.yml
+++ b/config/feature_flags/development/namespaces_cache_first_auto_devops_config.yml
@@ -1,8 +1,8 @@
 ---
-name: group_project_api_preload_plans
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77538
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350176
-milestone: '14.7'
+name: namespaces_cache_first_auto_devops_config
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80937
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353503
+milestone: '14.9'
 type: development
 group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/new_environments_table.yml b/config/feature_flags/development/new_vulnerability_form.yml
index b97a4d49cd8..ee812484928 100644
--- a/config/feature_flags/development/new_environments_table.yml
+++ b/config/feature_flags/development/new_vulnerability_form.yml
@@ -1,8 +1,8 @@
 ---
-name: new_environments_table
+name: new_vulnerability_form
 introduced_by_url:
 rollout_issue_url:
-milestone: '14.4'
+milestone: '14.9'
 type: development
-group: group::release
+group: group::threat insights
 default_enabled: false
diff --git a/config/feature_flags/development/strong_parameters_for_project_controller.yml b/config/feature_flags/development/optimized_housekeeping.yml
index 458bfc4c485..9a5b9244116 100644
--- a/config/feature_flags/development/strong_parameters_for_project_controller.yml
+++ b/config/feature_flags/development/optimized_housekeeping.yml
@@ -1,8 +1,8 @@
 ---
-name: strong_parameters_for_project_controller
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79956
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352251
-milestone: '14.8'
+name: optimized_housekeeping
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81465
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353607
+milestone: '14.9'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/ci_bulk_insert_tags.yml b/config/feature_flags/development/pipeline_schedules_with_tags.yml
index 52a3e22379c..9eb7b60d300 100644
--- a/config/feature_flags/development/ci_bulk_insert_tags.yml
+++ b/config/feature_flags/development/pipeline_schedules_with_tags.yml
@@ -1,8 +1,8 @@
 ---
-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'
+name: pipeline_schedules_with_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81476
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354421
+milestone: '14.9'
 type: development
 group: group::pipeline execution
 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
deleted file mode 100644
index 24e4823997d..00000000000
--- a/config/feature_flags/development/preserve_latest_wal_locations_for_idempotent_jobs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: preserve_latest_wal_locations_for_idempotent_jobs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66280
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338350
-milestone: '14.3'
-type: development
-group: group::memory
-default_enabled: true
diff --git a/config/feature_flags/development/container_expiration_policies_historic_entry.yml b/config/feature_flags/development/prevent_sensitive_fields_from_serializable_hash.yml
index ab2111b3159..7bcbe6b79c2 100644
--- a/config/feature_flags/development/container_expiration_policies_historic_entry.yml
+++ b/config/feature_flags/development/prevent_sensitive_fields_from_serializable_hash.yml
@@ -1,8 +1,8 @@
 ---
-name: container_expiration_policies_historic_entry
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44444
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262639
-milestone: '13.5'
+name: prevent_sensitive_fields_from_serializable_hash
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81773
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353878
+milestone: '14.9'
 type: development
-group: group::package
+group: group::sharding
 default_enabled: false
diff --git a/config/feature_flags/development/project_import_schedule_worker_job_tracker.yml b/config/feature_flags/development/project_import_schedule_worker_job_tracker.yml
deleted file mode 100644
index 5dae4ddc60c..00000000000
--- a/config/feature_flags/development/project_import_schedule_worker_job_tracker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: project_import_schedule_worker_job_tracker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79097
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351408
-milestone: '14.8'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml
new file mode 100644
index 00000000000..77b5feafd6a
--- /dev/null
+++ b/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml
@@ -0,0 +1,8 @@
+---
+name: projects_build_artifacts_size_refresh_high
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
+milestone: '14.9'
+type: development
+group: group::pipeline insights
+default_enabled: false
diff --git a/config/feature_flags/development/publish_project_deleted_event.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml
index 1287ebe9f66..cefecb245e3 100644
--- a/config/feature_flags/development/publish_project_deleted_event.yml
+++ b/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml
@@ -1,8 +1,8 @@
 ---
-name: publish_project_deleted_event
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78862
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351073
-milestone: '14.8'
+name: projects_build_artifacts_size_refresh_low
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
+milestone: '14.9'
 type: development
 group: group::pipeline insights
 default_enabled: false
diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml
new file mode 100644
index 00000000000..caeb6647782
--- /dev/null
+++ b/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml
@@ -0,0 +1,8 @@
+---
+name: projects_build_artifacts_size_refresh_medium
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
+milestone: '14.9'
+type: development
+group: group::pipeline insights
+default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_profile_update_username.yml b/config/feature_flags/development/rate_limit_profile_update_username.yml
deleted file mode 100644
index e72e3d605e3..00000000000
--- a/config/feature_flags/development/rate_limit_profile_update_username.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rate_limit_profile_update_username
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77221
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349132
-milestone: '14.7'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml b/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml
deleted file mode 100644
index af1957e54c8..00000000000
--- a/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rate_limit_user_sign_up_endpoint
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77835
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349843
-milestone: '14.7'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_username_exists_endpoint.yml b/config/feature_flags/development/rate_limit_username_exists_endpoint.yml
deleted file mode 100644
index 5a82dc96943..00000000000
--- a/config/feature_flags/development/rate_limit_username_exists_endpoint.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rate_limit_username_exists_endpoint
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77119
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348974
-milestone: '14.7'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/read_from_vulnerability_finding_evidence.yml b/config/feature_flags/development/read_from_vulnerability_finding_evidence.yml
deleted file mode 100644
index 076339c4f32..00000000000
--- a/config/feature_flags/development/read_from_vulnerability_finding_evidence.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: read_from_vulnerability_finding_evidence
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79883
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352632
-milestone: '14.8'
-type: development
-group: group::threat insights
-default_enabled: false
diff --git a/config/feature_flags/development/real_time_issue_sidebar.yml b/config/feature_flags/development/real_time_issue_sidebar.yml
deleted file mode 100644
index 12d3da86cad..00000000000
--- a/config/feature_flags/development/real_time_issue_sidebar.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: real_time_issue_sidebar
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30239
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1210
-milestone: '13.0'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/remove_import_data_on_failure.yml b/config/feature_flags/development/remove_import_data_on_failure.yml
index 5fa82eee981..341e027f28b 100644
--- a/config/feature_flags/development/remove_import_data_on_failure.yml
+++ b/config/feature_flags/development/remove_import_data_on_failure.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352156
 milestone: '14.8'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/jupyter_clean_diffs.yml b/config/feature_flags/development/rendered_diffs_viewer.yml
index 0f3f6fe3057..e159b2656e1 100644
--- a/config/feature_flags/development/jupyter_clean_diffs.yml
+++ b/config/feature_flags/development/rendered_diffs_viewer.yml
@@ -1,8 +1,8 @@
 ---
-name: jupyter_clean_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71477
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343433
-milestone: '14.5'
+name: rendered_diffs_viewer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75500
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352831
+milestone: '14.9'
 type: development
 group: group::incubation
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/experiment/ci_runner_templates.yml b/config/feature_flags/development/role_targeted_broadcast_messages.yml
index e791581f67a..3de916d9e6d 100644
--- a/config/feature_flags/experiment/ci_runner_templates.yml
+++ b/config/feature_flags/development/role_targeted_broadcast_messages.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_runner_templates
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58357
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326725
-milestone: "14.0"
-type: experiment
+name: role_targeted_broadcast_messages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81232
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351736
+milestone: '14.9'
+type: development
 group: group::activation
 default_enabled: false
diff --git a/config/feature_flags/development/route_hll_to_snowplow.yml b/config/feature_flags/development/route_hll_to_snowplow.yml
new file mode 100644
index 00000000000..3c8f7826a0a
--- /dev/null
+++ b/config/feature_flags/development/route_hll_to_snowplow.yml
@@ -0,0 +1,8 @@
+---
+name: route_hll_to_snowplow
+introduced_by_url: https://gitlab.com/gitlab-org/product-intelligence/-/issues/498
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354442
+milestone: '14.9'
+type: development
+group: group::product intelligence
+default_enabled: false
diff --git a/config/feature_flags/development/fix_comment_scroll.yml b/config/feature_flags/development/saved_replies.yml
index 706cd816288..b6a7151addf 100644
--- a/config/feature_flags/development/fix_comment_scroll.yml
+++ b/config/feature_flags/development/saved_replies.yml
@@ -1,8 +1,8 @@
 ---
-name: fix_comment_scroll
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76340
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349638
-milestone: '14.7'
+name: saved_replies
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80811
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352956
+milestone: '14.9'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/secure_vulnerability_training.yml b/config/feature_flags/development/secure_vulnerability_training.yml
index 58117482e25..7dbc25f1ebf 100644
--- a/config/feature_flags/development/secure_vulnerability_training.yml
+++ b/config/feature_flags/development/secure_vulnerability_training.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346308
 milestone: '14.6'
 type: development
 group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/security_report_ingestion_framework.yml b/config/feature_flags/development/show_report_validation_warnings.yml
index 6c146b7073d..551d432a928 100644
--- a/config/feature_flags/development/security_report_ingestion_framework.yml
+++ b/config/feature_flags/development/show_report_validation_warnings.yml
@@ -1,8 +1,8 @@
 ---
-name: security_report_ingestion_framework
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66735
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343332
-milestone: '14.4'
+name: show_report_validation_warnings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80930
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353125
+milestone: '14.9'
 type: development
 group: group::threat insights
 default_enabled: true
diff --git a/config/feature_flags/development/consolidated_edit_button.yml b/config/feature_flags/development/source_editor_toolbar.yml
index c618f70555b..6fe2dd2d306 100644
--- a/config/feature_flags/development/consolidated_edit_button.yml
+++ b/config/feature_flags/development/source_editor_toolbar.yml
@@ -1,8 +1,8 @@
 ---
-name: consolidated_edit_button
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44311
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270433
-milestone: '13.5'
+name: source_editor_toolbar
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82304
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354748
+milestone: '14.9'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/fork_project_form.yml b/config/feature_flags/development/spread_parallel_import.yml
index 90532c78c8a..1e75502e032 100644
--- a/config/feature_flags/development/fork_project_form.yml
+++ b/config/feature_flags/development/spread_parallel_import.yml
@@ -1,8 +1,8 @@
 ---
-name: fork_project_form
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53544
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321387
-milestone: '13.10'
+name: spread_parallel_import
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81026
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353217
+milestone: '14.9'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/track_error_tracking_activity.yml b/config/feature_flags/development/track_error_tracking_activity.yml
new file mode 100644
index 00000000000..c21a8d1aede
--- /dev/null
+++ b/config/feature_flags/development/track_error_tracking_activity.yml
@@ -0,0 +1,8 @@
+---
+name: track_error_tracking_activity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355112
+milestone: '14.9'
+type: development
+group: group::respond
+default_enabled: false
diff --git a/config/feature_flags/development/track_file_size_over_highlight_limit.yml b/config/feature_flags/development/track_file_size_over_highlight_limit.yml
deleted file mode 100644
index 431c646f54d..00000000000
--- a/config/feature_flags/development/track_file_size_over_highlight_limit.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: track_file_size_over_highlight_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61273
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330374
-milestone: '13.12'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/track_work_items_activity.yml b/config/feature_flags/development/track_work_items_activity.yml
new file mode 100644
index 00000000000..e4614f2d5e2
--- /dev/null
+++ b/config/feature_flags/development/track_work_items_activity.yml
@@ -0,0 +1,8 @@
+---
+name: track_work_items_activity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80532
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352903
+milestone: '14.9'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/snippets_binary_blob.yml b/config/feature_flags/development/ukraine_support_tanuki.yml
index 72a959858d9..3a2c64a5aa4 100644
--- a/config/feature_flags/development/snippets_binary_blob.yml
+++ b/config/feature_flags/development/ukraine_support_tanuki.yml
@@ -1,8 +1,8 @@
 ---
-name: snippets_binary_blob
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37419
-rollout_issue_url: 
-milestone: '13.3'
+name: ukraine_support_tanuki
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82050
+rollout_issue_url:
+milestone: '14.9'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_i_snippets_show.yml b/config/feature_flags/development/use_received_header_for_incoming_emails.yml
index 446338d5b95..e466a266367 100644
--- a/config/feature_flags/development/usage_data_i_snippets_show.yml
+++ b/config/feature_flags/development/use_received_header_for_incoming_emails.yml
@@ -1,8 +1,8 @@
 ---
-name: usage_data_i_snippets_show
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48113
+name: use_received_header_for_incoming_emails
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81489
 rollout_issue_url:
-milestone: '13.7'
+milestone: '14.9'
 type: development
-group: group::editor
+group: group::certify
 default_enabled: true
diff --git a/config/feature_flags/development/context_commits.yml b/config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml
index 521ab5d0a6f..44da565181f 100644
--- a/config/feature_flags/development/context_commits.yml
+++ b/config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml
@@ -1,8 +1,8 @@
 ---
-name: context_commits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320757
-milestone: '12.8'
+name: verify_protected_tags_for_pull_mirror
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80388
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352494
+milestone: '14.9'
 type: development
-group: group::code review
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/vsa_consistency_worker.yml b/config/feature_flags/development/vsa_consistency_worker.yml
new file mode 100644
index 00000000000..d880f38af69
--- /dev/null
+++ b/config/feature_flags/development/vsa_consistency_worker.yml
@@ -0,0 +1,8 @@
+---
+name: vsa_consistency_worker
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355709
+milestone: '14.9'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/vsa_incremental_worker.yml b/config/feature_flags/development/vsa_incremental_worker.yml
new file mode 100644
index 00000000000..9caad7818e7
--- /dev/null
+++ b/config/feature_flags/development/vsa_incremental_worker.yml
@@ -0,0 +1,8 @@
+---
+name: vsa_incremental_worker
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353453
+milestone: '14.9'
+type: development
+group: group::optimize
+default_enabled: true
diff --git a/config/feature_flags/development/vulnerability_finding_replace_metadata.yml b/config/feature_flags/development/vulnerability_finding_replace_metadata.yml
deleted file mode 100644
index 2774547668f..00000000000
--- a/config/feature_flags/development/vulnerability_finding_replace_metadata.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: vulnerability_finding_replace_metadata
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66868
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337253
-milestone: '14.2'
-group: group::threat insights
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/enforce_security_report_validation.yml b/config/feature_flags/development/vulnerability_reads_table.yml
index ada5863b4d7..68e6ffead14 100644
--- a/config/feature_flags/development/enforce_security_report_validation.yml
+++ b/config/feature_flags/development/vulnerability_reads_table.yml
@@ -1,8 +1,8 @@
 ---
-name: enforce_security_report_validation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79798
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351000
-milestone: '14.8'
+name: vulnerability_reads_table
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76220
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348151
+milestone: '14.9'
 type: development
 group: group::threat insights
 default_enabled: false
diff --git a/config/feature_flags/development/wiki_front_matter.yml b/config/feature_flags/development/wiki_front_matter.yml
deleted file mode 100644
index 39196440d17..00000000000
--- a/config/feature_flags/development/wiki_front_matter.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: wiki_front_matter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27706
-rollout_issue_url: 
-milestone: '12.10'
-type: development
-group: group::editor
-default_enabled: false
diff --git a/config/feature_flags/experiment/change_continuous_onboarding_link_urls.yml b/config/feature_flags/experiment/change_continuous_onboarding_link_urls.yml
deleted file mode 100644
index e65d7cd8d94..00000000000
--- a/config/feature_flags/experiment/change_continuous_onboarding_link_urls.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: change_continuous_onboarding_link_urls
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71408
-rollout_issue_url:
-milestone: '14.5'
-type: experiment
-group: group::conversion
-default_enabled: false
diff --git a/config/feature_flags/experiment/confetti_post_signup.yml b/config/feature_flags/experiment/confetti_post_signup.yml
deleted file mode 100644
index 9f677bf252a..00000000000
--- a/config/feature_flags/experiment/confetti_post_signup.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: confetti_post_signup
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70011
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339890
-milestone: '14.5'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/pipeline_editor_walkthrough.yml b/config/feature_flags/experiment/pipeline_editor_walkthrough.yml
deleted file mode 100644
index 6d8895cbab7..00000000000
--- a/config/feature_flags/experiment/pipeline_editor_walkthrough.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_editor_walkthrough
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73050
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345558
-milestone: '14.5'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/experiment/code_quality_walkthrough.yml b/config/feature_flags/experiment/runners_availability_section.yml
index 572a0dc0a9f..41286c94e02 100644
--- a/config/feature_flags/experiment/code_quality_walkthrough.yml
+++ b/config/feature_flags/experiment/runners_availability_section.yml
@@ -1,8 +1,8 @@
 ---
-name: code_quality_walkthrough
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327229
-milestone: "13.12"
+name: runners_availability_section
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80717
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352850
+milestone: '14.9'
 type: experiment
 group: group::activation
 default_enabled: false
diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
index a55e3e67710..c11c6758189 100644
--- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml
+++ b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
@@ -1,8 +1,8 @@
 ---
 name: api_kaminari_count_with_limit
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353077
 milestone: '11.8'
 type: ops
 group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/ops/certificate_based_clusters.yml b/config/feature_flags/ops/certificate_based_clusters.yml
new file mode 100644
index 00000000000..eaf4151b80a
--- /dev/null
+++ b/config/feature_flags/ops/certificate_based_clusters.yml
@@ -0,0 +1,8 @@
+---
+name: certificate_based_clusters
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81054
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353410
+milestone: '14.9'
+type: ops
+group: group::configure
+default_enabled: true
diff --git a/config/feature_flags/ops/deprecated_serverless.yml b/config/feature_flags/ops/deprecated_serverless.yml
new file mode 100644
index 00000000000..0982778f139
--- /dev/null
+++ b/config/feature_flags/ops/deprecated_serverless.yml
@@ -0,0 +1,8 @@
+---
+name: deprecated_serverless
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81493'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/353901'
+milestone: '14.9'
+type: ops
+group: 'group::configure'
+default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_experiment.yml b/config/feature_flags/ops/gitlab_experiment.yml
new file mode 100644
index 00000000000..bd676fc7c9c
--- /dev/null
+++ b/config/feature_flags/ops/gitlab_experiment.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_experiment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81834
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353921
+milestone: '14.9'
+type: ops
+group: group::conversion
+default_enabled: true
diff --git a/config/feature_flags/ops/purge_stale_security_findings.yml b/config/feature_flags/ops/purge_stale_security_findings.yml
new file mode 100644
index 00000000000..322f31b62ce
--- /dev/null
+++ b/config/feature_flags/ops/purge_stale_security_findings.yml
@@ -0,0 +1,8 @@
+---
+name: purge_stale_security_findings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81423
+rollout_issue_url:
+milestone: '14.9'
+type: ops
+group: group::threat insights
+default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 6758afc91c4..88af8cc12aa 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -185,7 +185,7 @@ production: &base
 
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
-  # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
+  # For documentation on how to set this up, see https://docs.gitlab.com/ee/administration/reply_by_email.html
   incoming_email:
     enabled: false
 
@@ -230,7 +230,23 @@ production: &base
     #   client_id: "YOUR-CLIENT-ID"
     #   client_secret: "YOUR-CLIENT-SECRET"
 
-    # File that contains the shared secret key for verifying access for mailroom's incoming_email.
+    # How mailroom delivers email content to Rails. There are two methods at the moment:
+    # - sidekiq: mailroom pushes the email content to Sidekiq directly. This job
+    # is then picked up by Sidekiq.
+    # - webhook: mailroom triggers a HTTP POST request to Rails web server. The
+    # content is embedded into the request body.
+    # Default is sidekiq.
+    # delivery_method: sidekiq
+
+    # When the delivery method is webhook, those configs tell the url that
+    # mailroom can contact to. Note that the combined url must not end with "/".
+    # At the moment, the webhook delivery method doesn't support HTTP/HTTPs via
+    # UNIX socket.
+    # gitlab_url: "http://gitlab.example"
+
+    # When the delivery method is webhook, this config is the file that
+    # contains the shared secret key for verifying access for mailroom's
+    # incoming_email.
     # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app).
     # secret_file: /home/git/gitlab/.gitlab_mailroom_secret
 
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index f46e005dacf..7f9539c3604 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -78,9 +78,6 @@ ci_pipelines:
   - table: merge_requests
     column: merge_request_id
     on_delete: async_delete
-  - table: external_pull_requests
-    column: external_pull_request_id
-    on_delete: async_nullify
   - table: users
     column: user_id
     on_delete: async_nullify
diff --git a/config/helpers/incremental_webpack_compiler/compiler.js b/config/helpers/incremental_webpack_compiler/compiler.js
index 0ef090bce24..2614501faa4 100644
--- a/config/helpers/incremental_webpack_compiler/compiler.js
+++ b/config/helpers/incremental_webpack_compiler/compiler.js
@@ -102,7 +102,7 @@ class IncrementalWebpackCompiler {
 
         setTimeout(() => {
           devServer.invalidate(() => {
-            if (devServer.sockets) {
+            if (Array.isArray(devServer.webSocketServer && devServer.webSocketServer.clients)) {
               devServer.sendMessage(devServer.webSocketServer.clients, 'static-changed');
             }
           });
diff --git a/config/initializers/01_active_record_database_tasks_configuration_flag.rb b/config/initializers/01_active_record_database_tasks_configuration_flag.rb
new file mode 100644
index 00000000000..37374a41a30
--- /dev/null
+++ b/config/initializers/01_active_record_database_tasks_configuration_flag.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+if Rails::VERSION::MAJOR >= 7
+  raise "Remove `#{__FILE__}`. This is backport of `database_tasks:` Rails 7.x feature."
+end
+
+# This backports `database_tasks:` feature to skip running migrations for some databases
+# PR: https://github.com/rails/rails/pull/42794/files
+
+module DatabaseTasks
+  module ActiveRecordDatabaseConfigurations
+    def configs_for(env_name: nil, name: nil, include_replicas: false)
+      configs = super
+
+      unless include_replicas
+        if name
+          configs = nil unless configs&.database_tasks?
+        else
+          configs = configs.select do |db_config|
+            db_config.database_tasks?
+          end
+        end
+      end
+
+      configs
+    end
+  end
+
+  module ActiveRecordDatabaseConfigurationsHashConfig
+    def database_tasks? # :nodoc:
+      !replica? && !!configuration_hash.fetch(:database_tasks, true)
+    end
+  end
+end
+
+ActiveRecord::DatabaseConfigurations.prepend(DatabaseTasks::ActiveRecordDatabaseConfigurations)
+ActiveRecord::DatabaseConfigurations::HashConfig.prepend(DatabaseTasks::ActiveRecordDatabaseConfigurationsHashConfig)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 07d6e8e4882..25d142566f0 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -611,28 +611,40 @@ Settings.cron_jobs['ci_delete_unit_tests_worker']['job_class'] = 'Ci::DeleteUnit
 Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['batched_background_migrations_worker']['cron'] ||= '* * * * *'
 Settings.cron_jobs['batched_background_migrations_worker']['job_class'] = 'Database::BatchedBackgroundMigrationWorker'
+Settings.cron_jobs['batched_background_migration_worker_ci_database'] ||= Settingslogic.new({})
+Settings.cron_jobs['batched_background_migration_worker_ci_database']['cron'] ||= '* * * * *'
+Settings.cron_jobs['batched_background_migration_worker_ci_database']['job_class'] = 'Database::BatchedBackgroundMigration::CiDatabaseWorker'
 Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances'] ||= Settingslogic.new({})
 Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances']['cron'] ||= '*/15 * * * *'
 Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances']['job_class'] = 'Issues::RescheduleStuckIssueRebalancesWorker'
 Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker']['cron'] ||= '0 * * * *'
 Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker']['job_class'] = 'Clusters::Integrations::CheckPrometheusHealthWorker'
+Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker']['cron'] ||= '2/17 * * * *'
+Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker']['job_class'] = 'Projects::ScheduleRefreshBuildArtifactsSizeStatisticsWorker'
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 1 * * *'
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['job_class'] = 'Analytics::DevopsAdoption::CreateAllSnapshotsWorker'
+  Settings.cron_jobs['analytics_cycle_analytics_incremental_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['analytics_cycle_analytics_incremental_worker']['cron'] ||= '*/10 * * * *'
+  Settings.cron_jobs['analytics_cycle_analytics_incremental_worker']['job_class'] = 'Analytics::CycleAnalytics::IncrementalWorker'
+  Settings.cron_jobs['analytics_cycle_analytics_consistency_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['cron'] ||= '*/30 * * * *'
+  Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['job_class'] = 'Analytics::CycleAnalytics::ConsistencyWorker'
   Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *'
   Settings.cron_jobs['active_user_count_threshold_worker']['job_class'] = 'ActiveUserCountThresholdWorker'
   Settings.cron_jobs['adjourned_group_deletion_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['adjourned_group_deletion_worker']['cron'] ||= '0 3 * * *'
+  Settings.cron_jobs['adjourned_group_deletion_worker']['cron'] ||= '0 2 * * *'
   Settings.cron_jobs['adjourned_group_deletion_worker']['job_class'] = 'AdjournedGroupDeletionWorker'
   Settings.cron_jobs['clear_shared_runners_minutes_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['clear_shared_runners_minutes_worker']['cron'] ||= '0 0 1 * *'
   Settings.cron_jobs['clear_shared_runners_minutes_worker']['job_class'] = 'ClearSharedRunnersMinutesWorker'
   Settings.cron_jobs['adjourned_projects_deletion_cron_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['cron'] ||= '0 4 * * *'
+  Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['cron'] ||= '0 7 * * *'
   Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['job_class'] = 'AdjournedProjectsDeletionCronWorker'
   Settings.cron_jobs['geo_verification_cron_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['geo_verification_cron_worker']['cron'] ||= '* * * * *'
@@ -739,6 +751,9 @@ Gitlab.ee do
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['cron'] ||= '*/15 * * * *'
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['job_class'] = 'Security::OrchestrationPolicyRuleScheduleWorker'
+  Settings.cron_jobs['security_findings_cleanup_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['security_findings_cleanup_worker']['cron'] ||= '0 */4 * * 6,0'
+  Settings.cron_jobs['security_findings_cleanup_worker']['job_class'] = 'Security::Findings::CleanupWorker'
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['cron'] ||= '7-59/15 * * * *'
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['job_class'] = 'AppSec::Dast::ProfileScheduleWorker'
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index c55b074f9c8..e4d47d53815 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+PUMA_EXTERNAL_METRICS_SERVER = Gitlab::Utils.to_boolean(ENV['PUMA_EXTERNAL_METRICS_SERVER'])
+require Rails.root.join('metrics_server', 'metrics_server') if PUMA_EXTERNAL_METRICS_SERVER
+
 # Keep separate directories for separate processes
 def prometheus_default_multiproc_dir
   return unless Rails.env.development? || Rails.env.test?
@@ -34,8 +37,6 @@ end
 ::Prometheus::Client.configure do |config|
   config.logger = Gitlab::AppLogger
 
-  config.initial_mmap_file_size = 4 * 1024
-
   config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] || prometheus_default_multiproc_dir
 
   config.pid_provider = ::Prometheus::PidProvider.method(:worker_id)
@@ -46,6 +47,10 @@ Gitlab::Application.configure do |config|
   config.middleware.insert_after(Labkit::Middleware::Rack, Gitlab::Metrics::RequestsRackMiddleware)
 end
 
+# Any actions beyond this check should only execute outside of tests, when running in an application
+# context (i.e. not in the Rails console or rspec) and when users have enabled metrics.
+return if Rails.env.test? || !Gitlab::Runtime.application? || !Gitlab::Metrics.prometheus_metrics_enabled?
+
 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.
@@ -64,67 +69,75 @@ if Gitlab::Runtime.sidekiq? && (!ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER
   end
 end
 
-if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
-  Gitlab::Cluster::LifecycleEvents.on_master_start do
-    if Gitlab::Runtime.puma?
-      Gitlab::Metrics::Samplers::PumaSampler.instance.start
-    end
+Gitlab::Cluster::LifecycleEvents.on_master_start do
+  Gitlab::Metrics.gauge(:deployments, 'GitLab Version', {}, :max).set({ version: Gitlab::VERSION, revision: Gitlab.revision }, 1)
 
-    Gitlab::Metrics.gauge(:deployments, 'GitLab Version', {}, :max).set({ version: Gitlab::VERSION, revision: Gitlab.revision }, 1)
+  if Gitlab::Runtime.puma?
+    Gitlab::Metrics::Samplers::PumaSampler.instance.start
 
-    Gitlab::Ci::Parsers.instrument!
-  rescue IOError => e
-    Gitlab::ErrorTracking.track_exception(e)
-    Gitlab::Metrics.error_detected!
+    if PUMA_EXTERNAL_METRICS_SERVER && Settings.monitoring.web_exporter.enabled
+      MetricsServer.start_for_puma
+    else
+      Gitlab::Metrics::Exporter::WebExporter.instance.start
+    end
   end
 
-  Gitlab::Cluster::LifecycleEvents.on_worker_start do
-    defined?(::Prometheus::Client.reinitialize_on_pid_change) && ::Prometheus::Client.reinitialize_on_pid_change
-    logger = Gitlab::AppLogger
-    Gitlab::Metrics::Samplers::RubySampler.initialize_instance(logger: logger).start
-    Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance(logger: logger).start
-    Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance(logger: logger).start
-
-    if Gitlab::Runtime.web_server?
-      Gitlab::Metrics::Samplers::ActionCableSampler.instance(logger: logger).start
-    end
+  Gitlab::Ci::Parsers.instrument!
+rescue IOError => e
+  Gitlab::ErrorTracking.track_exception(e)
+  Gitlab::Metrics.error_detected!
+end
 
-    if Gitlab.ee? && Gitlab::Runtime.sidekiq?
-      Gitlab::Metrics::Samplers::GlobalSearchSampler.instance(logger: logger).start
+Gitlab::Cluster::LifecycleEvents.on_worker_start do
+  defined?(::Prometheus::Client.reinitialize_on_pid_change) && ::Prometheus::Client.reinitialize_on_pid_change
+  logger = Gitlab::AppLogger
+  Gitlab::Metrics::Samplers::RubySampler.initialize_instance(logger: logger).start
+  Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance(logger: logger).start
+  Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance(logger: logger).start
+
+  if Gitlab::Runtime.puma?
+    # Since we are observing a metrics server from the Puma primary, we would inherit
+    # this supervision thread after forking into workers, so we need to explicitly stop it here.
+    if PUMA_EXTERNAL_METRICS_SERVER
+      ::MetricsServer::PumaProcessSupervisor.instance.stop
+    else
+      Gitlab::Metrics::Exporter::WebExporter.instance.stop
     end
 
-    Gitlab::Ci::Parsers.instrument!
-  rescue IOError => e
-    Gitlab::ErrorTracking.track_exception(e)
-    Gitlab::Metrics.error_detected!
+    Gitlab::Metrics::Samplers::ActionCableSampler.instance(logger: logger).start
   end
-end
 
-if Gitlab::Runtime.web_server?
-  Gitlab::Cluster::LifecycleEvents.on_master_start do
-    Gitlab::Metrics::Exporter::WebExporter.instance.start
+  if Gitlab.ee? && Gitlab::Runtime.sidekiq?
+    Gitlab::Metrics::Samplers::GlobalSearchSampler.instance(logger: logger).start
   end
 
+  Gitlab::Ci::Parsers.instrument!
+rescue IOError => e
+  Gitlab::ErrorTracking.track_exception(e)
+  Gitlab::Metrics.error_detected!
+end
+
+if Gitlab::Runtime.puma?
   Gitlab::Cluster::LifecycleEvents.on_before_graceful_shutdown do
     # We need to ensure that before we re-exec or shutdown server
-    # we do stop the exporter
-    Gitlab::Metrics::Exporter::WebExporter.instance.stop
+    # we also stop the metrics server
+    if PUMA_EXTERNAL_METRICS_SERVER
+      ::MetricsServer::PumaProcessSupervisor.instance.shutdown
+    else
+      Gitlab::Metrics::Exporter::WebExporter.instance.stop
+    end
   end
 
   Gitlab::Cluster::LifecycleEvents.on_before_master_restart do
     # We need to ensure that before we re-exec server
-    # we do stop the exporter
+    # we also stop the metrics server
     #
     # We do it again, for being extra safe,
     # but it should not be needed
-    Gitlab::Metrics::Exporter::WebExporter.instance.stop
-  end
-
-  Gitlab::Cluster::LifecycleEvents.on_worker_start do
-    # The `#close_on_exec=` takes effect only on `execve`
-    # but this does not happen for Ruby fork
-    #
-    # This does stop server, as it is running on master.
-    Gitlab::Metrics::Exporter::WebExporter.instance.stop
+    if PUMA_EXTERNAL_METRICS_SERVER
+      ::MetricsServer::PumaProcessSupervisor.instance.shutdown
+    else
+      Gitlab::Metrics::Exporter::WebExporter.instance.stop
+    end
   end
 end
diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb
index 0d2073586be..3f9ceb7cfa7 100644
--- a/config/initializers/action_cable.rb
+++ b/config/initializers/action_cable.rb
@@ -10,6 +10,7 @@ Rails.application.configure do
 end
 
 ActionCable::SubscriptionAdapter::Base.prepend(Gitlab::Patch::ActionCableSubscriptionAdapterIdentifier)
+ActionCable::SubscriptionAdapter::Redis::Listener.prepend(Gitlab::Patch::ActionCableRedisListener)
 
 # https://github.com/rails/rails/blob/bb5ac1623e8de08c1b7b62b1368758f0d3bb6379/actioncable/lib/action_cable/subscription_adapter/redis.rb#L18
 ActionCable::SubscriptionAdapter::Redis.redis_connector = lambda do |config|
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
index 8a2fe1d8388..d1010e054af 100644
--- a/config/initializers/database_query_analyzers.rb
+++ b/config/initializers/database_query_analyzers.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
 # Currently we register validator only for `dev` or `test` environment
-if Gitlab.dev_or_test_env? || Gitlab::Utils.to_boolean(ENV['GITLAB_ENABLE_QUERY_ANALYZERS'], default: false)
-  Gitlab::Database::QueryAnalyzer.instance.hook!
-  Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
+Gitlab::Database::QueryAnalyzer.instance.hook!
+Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
 
-  if Rails.env.test? || Gitlab::Utils.to_boolean(ENV['ENABLE_CROSS_DATABASE_MODIFICATION_DETECTION'], default: false)
-    Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
-  end
+if Rails.env.test? || Gitlab::Utils.to_boolean(ENV['ENABLE_CROSS_DATABASE_MODIFICATION_DETECTION'], default: false)
+  Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
+end
 
-  Gitlab::Application.configure do |config|
-    config.middleware.use(Gitlab::Middleware::QueryAnalyzer)
-  end
+Gitlab::Application.configure do |config|
+  config.middleware.use(Gitlab::Middleware::QueryAnalyzer)
 end
diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb
index fdb21d90c28..9a6ef325c9e 100644
--- a/config/initializers/gitlab_experiment.rb
+++ b/config/initializers/gitlab_experiment.rb
@@ -49,7 +49,7 @@ Gitlab::Experiment.configure do |config|
   #
   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)
+    Gitlab.com? && (url = URI.parse(url)) && valid_domains.include?(url.host)
   rescue URI::InvalidURIError
     false
   end
diff --git a/config/initializers/http_hostname_override.rb b/config/initializers/http_hostname_override.rb
index 5d2739c1f58..3d840cd3251 100644
--- a/config/initializers/http_hostname_override.rb
+++ b/config/initializers/http_hostname_override.rb
@@ -34,6 +34,7 @@ end
 
 class Net::HTTP
   attr_accessor :hostname_override
+
   SSL_IVNAMES << :@hostname_override
   SSL_ATTRIBUTES << :hostname_override
 
diff --git a/config/initializers/rails_host_authorization.rb b/config/initializers/rails_host_authorization.rb
index 22bb6fb7061..6fe4679433c 100644
--- a/config/initializers/rails_host_authorization.rb
+++ b/config/initializers/rails_host_authorization.rb
@@ -8,7 +8,7 @@ if Gitlab.config.gitlab.allowed_hosts.present?
 end
 
 if Rails.env.development?
-  Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix', 'host.docker.internal']
+  Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix', 'host.docker.internal', 'docker.for.mac.localhost']
 
   if ENV['RAILS_HOSTS']
     additional_hosts = ENV['RAILS_HOSTS'].split(',').select(&:presence)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index baf252a5d10..25984c45318 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -30,8 +30,6 @@ Sidekiq.configure_server do |config|
   config.options[:strict] = false
   config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues])
 
-  Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
-
   if enable_json_logs
     config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new
     config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger
@@ -41,6 +39,8 @@ Sidekiq.configure_server do |config|
     config.error_handlers.reject! { |handler| handler.is_a?(Sidekiq::ExceptionHandler::Logger) }
   end
 
+  Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
+
   config.redis = queues_config_hash
 
   config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator(
diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb
index 876ae5da230..64686bdd962 100644
--- a/config/initializers_before_autoloader/000_inflections.rb
+++ b/config/initializers_before_autoloader/000_inflections.rb
@@ -40,4 +40,5 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'JH'
   inflect.acronym 'CSP'
   inflect.acronym 'VSCode'
+  inflect.acronym 'FIPS'
 end
diff --git a/config/mail_room.yml b/config/mail_room.yml
index 669925c2390..49cb765ebe6 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -1,7 +1,7 @@
 :mailboxes:
   <%
     require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
-    Gitlab::MailRoom.enabled_configs.each do |_key, config|
+    Gitlab::MailRoom.enabled_configs.each do |key, config|
   %>
     -
       :host: <%= config[:host].to_json %>
@@ -26,6 +26,7 @@
       <%= config.slice(:inbox_options).to_yaml(indentation: 8).gsub(/^---\n/, '') %>
       <% end %>
 
+      <% if config[:delivery_method] == Gitlab::MailRoom::DELIVERY_METHOD_SIDEKIQ %>
       :delivery_method: sidekiq
       :delivery_options:
         :redis_url: <%= config[:redis_url].to_json %>
@@ -41,6 +42,15 @@
             :port: <%= sentinel[:port] %>
           <% end %>
         <% end %>
+      <% elsif config[:delivery_method] == Gitlab::MailRoom::DELIVERY_METHOD_WEBHOOK %>
+      :delivery_method: postback
+      :delivery_options:
+        :delivery_url: <%= config[:gitlab_url] %>/api/v4/internal/mail_room/<%= key %>
+        :jwt_auth_header: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_HEADER %>
+        :jwt_issuer: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_JWT_ISSUER %>
+        :jwt_algorithm: "HS256"
+        :jwt_secret_path: <%= config[:secret_file] %>
+      <% end %>
 
       :arbitration_method: redis
       :arbitration_options:
diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml
index 50d5122e806..0a9aec02b1a 100644
--- a/config/metrics/aggregates/common.yml
+++ b/config/metrics/aggregates/common.yml
@@ -62,3 +62,27 @@
     - 'i_testing_group_code_coverage_visit_total'
     - 'i_testing_load_performance_widget_total'
     - 'i_testing_metrics_report_widget_total'
+- name: xmau_plan
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
+- name: xmau_project_management
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
+- name: users_work_items
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 0c1523797c0..8664ee1bcc9 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index b13560ede4c..d21d70c8abb 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 4d9b6b2cd9c..47bf8c9c821 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 5c4f21f3b3c..fe7fcb65895 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
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 d27548980b0..9d12339717d 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 75129e5d824..bfc39e672ca 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index ee32c2baed9..3c0c401f38b 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -22,4 +22,5 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index 80842966536..c70a9337c6c 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 9ef4157ce2d..78622151915 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.release.failed_deployments
-description: Total failed deployments
+description: Disinct users who initiated a failed deployment.
 product_section: ops
 product_stage: release
 product_group: group::release
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index f21cb609208..10c9de1817f 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.release.successful_deployments
-description: Total successful deployments
+description: Disinct users who initiated a successful deployment.
 product_section: ops
 product_stage: release
 product_group: group::release
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index 4d676e436b2..eebce0dcb81 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
new file mode 100644
index 00000000000..d33dd895022
--- /dev/null
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_monthly
+description: Monthly counts of times users have executed deployment jobs
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: "14.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79272
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - ci_users_executing_deployment_job
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
new file mode 100644
index 00000000000..734bf674f00
--- /dev/null
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_title_monthly
+description: Unique users updating a work item's title
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80532
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_title
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
new file mode 100644
index 00000000000..30cd65425fe
--- /dev/null
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_creating_work_items_monthly
+description: Unique users creating work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81201
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_creating_work_items
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
new file mode 100644
index 00000000000..bab5f66eecd
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.xmau_plan
+description: Unique users interacting with Plan features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
new file mode 100644
index 00000000000..0f970f2a344
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.xmau_project_management
+description: Unique users interacting with Project Management features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
new file mode 100644
index 00000000000..a0111383f1d
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.users_work_items
+description: Unique users interacting with work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
new file mode 100644
index 00000000000..3a25e0a5a4b
--- /dev/null
+++ b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_details_monthly
+description: Unique users viewing the error details page
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
new file mode 100644
index 00000000000..c94cca65514
--- /dev/null
+++ b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_list_monthly
+description: Unique users viewing the list of errors in the project
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
new file mode 100644
index 00000000000..50a854eb455
--- /dev/null
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_total_unique_counts_monthly
+description: Total unique users accessing error tracking routes
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
new file mode 100644
index 00000000000..ca5f67e0ac5
--- /dev/null
+++ b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_weekly
+description: Weekly counts of times users have executed deployment jobs
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: "14.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79272
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - ci_users_executing_deployment_job
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
new file mode 100644
index 00000000000..92fb6dbd03d
--- /dev/null
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
+description: Unique users updating a work item's title
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80532
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_title
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
new file mode 100644
index 00000000000..0c7e18ec458
--- /dev/null
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
+description: Unique users creating work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81201
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_creating_work_items
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
new file mode 100644
index 00000000000..cc393d6b0a5
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.xmau_plan
+description: Unique users interacting with Plan features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
new file mode 100644
index 00000000000..40eaf21889e
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.xmau_project_management
+description: Unique users interacting with Project Management features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
new file mode 100644
index 00000000000..fe77e885449
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.users_work_items
+description: Unique users interacting with work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
new file mode 100644
index 00000000000..bb487abef6d
--- /dev/null
+++ b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_details_weekly
+description: Unique users viewing the error details page
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
new file mode 100644
index 00000000000..e75e6a20c81
--- /dev/null
+++ b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_list_weekly
+description: Unique users viewing the list of errors in the project
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..851fd6d0925
--- /dev/null
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_total_unique_counts_weekly
+description: Total unique users accessing error tracking routes
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index 3846e3b9fc7..1c5a42c4892 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.total
-description: 'Count number of projects imported monthly'
+description: Number of projects imported
 product_section: dev
 product_stage: manage
 product_group: group::import
diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
new file mode 100644
index 00000000000..0174f9a6222
--- /dev/null
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.service_usage_data_download_payload_click
+description: Count Download Payload button clicks
+data_category: optional
+name: count_promoted_issues
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: active
+time_frame: all
+data_source: redis
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
new file mode 100644
index 00000000000..90bdad02b8b
--- /dev/null
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.projects_harbor_active
+description: Count of projects with active integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
new file mode 100644
index 00000000000..6fc8d9a8ec2
--- /dev/null
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.groups_harbor_active
+description: Count of groups with active integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
new file mode 100644
index 00000000000..a5621da5390
--- /dev/null
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.instances_harbor_active
+description: Count of active instance-level integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
new file mode 100644
index 00000000000..97c31b331aa
--- /dev/null
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.projects_inheriting_harbor_active
+description: Count of active projects inheriting integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
new file mode 100644
index 00000000000..7091a87632f
--- /dev/null
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.groups_inheriting_harbor_active
+description: Count of active groups inheriting integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 6517c3bc4f5..8d00f03f52b 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -6,7 +6,8 @@ product_section: enablement
 product_stage: enablement
 product_group: group::distribution
 product_category: ''
-value_type: string
+value_type: object
+value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
 status: active
 milestone: "<13.9"
 time_frame: none
diff --git a/config/metrics/objects_schemas/git_version_schema.json b/config/metrics/objects_schemas/git_version_schema.json
new file mode 100644
index 00000000000..2489b05e188
--- /dev/null
+++ b/config/metrics/objects_schemas/git_version_schema.json
@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "required": ["major"],
+  "properties": {
+    "major": { "type": "number", "description": "Major version number" },
+    "minor": { "type": "number", "description": "Minor version number" },
+    "patch": { "type": "number", "description": "Patch number" }
+  }
+}
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
new file mode 100644
index 00000000000..6e17601e76d
--- /dev/null
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -0,0 +1,24 @@
+---
+key_path: settings.certificate_based_clusters_ff
+name: "certificate_based_clusters_ff"
+description: "Certificate-based clusters feature flag"
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category:
+value_type: boolean
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81311
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: CertBasedClustersFfMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/routes.rb b/config/routes.rb
index a57795bea0c..9342de492ec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -69,7 +69,10 @@ Rails.application.routes.draw do
       resources :groups, only: [:new, :create]
       resources :projects, only: [:new, :create]
       resources :groups_projects, only: [:new, :create] do
-        post :import, on: :collection
+        collection do
+          post :import
+          put :exit
+        end
       end
       draw :verification
     end
@@ -232,6 +235,7 @@ Rails.application.routes.draw do
   concern :clusterable do
     resources :clusters, only: [:index, :new, :show, :update, :destroy] do
       collection do
+        get  :connect
         post :create_user
         post :create_gcp
         post :create_aws
@@ -266,7 +270,7 @@ Rails.application.routes.draw do
 
   resources :projects, only: [:index, :new, :create]
 
-  get '/projects/:id' => 'projects#resolve'
+  get '/projects/:id' => 'projects/redirect#redirect_from_id'
 
   draw :git_http
   draw :api
diff --git a/config/routes/group.rb b/config/routes/group.rb
index c313f7209fb..fecd3135cba 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -94,7 +94,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
 
     concerns :clusterable
 
-    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+    resources :group_members, only: [:index, :update, :destroy], concerns: :access_requestable do
       post :resend_invite, on: :member
       delete :leave, on: :collection
     end
@@ -118,6 +118,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     end
 
     resources :container_registries, only: [:index, :show], controller: 'registry/repositories'
+    resources :harbor_registries, only: [:index, :show], controller: 'harbor/repositories'
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
 
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 1e871d52c80..344f0114364 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -20,4 +20,6 @@ namespace :jira_connect do
       put :update
     end
   end
+
+  resources :oauth_callbacks, only: [:index]
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 8536ec9fc05..1783f3acc68 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -96,6 +96,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         namespace :ci do
           resource :lint, only: [:show, :create]
           resource :pipeline_editor, only: [:show], controller: :pipeline_editor, path: 'editor'
+          resource :secure_files, only: [:show], controller: :secure_files, path: 'secure_files'
           resources :daily_build_group_report_results, only: [:index], constraints: { format: /(csv|json)/ }
           namespace :prometheus_metrics do
             resources :histograms, only: [:create], constraints: { format: 'json' }
@@ -162,14 +163,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :project_members, except: [:show, :new, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do
+        resources :project_members, except: [:show, :new, :create, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do
           collection do
             delete :leave
-
-            # Used for import team
-            # from another project
-            get :import
-            post :apply_import
           end
 
           member do
@@ -240,6 +236,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
+
         resources :logs, only: [:index] do
           collection do
             get :k8s
@@ -319,7 +317,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         resources :google_cloud, only: [:index]
 
         namespace :google_cloud do
+          resources :revoke_oauth, only: [:create]
           resources :service_accounts, only: [:index, :create]
+          resources :gcp_regions, only: [:index, :create]
 
           get '/deployments/cloud_run', to: 'deployments#cloud_run'
           get '/deployments/cloud_storage', to: 'deployments#cloud_storage'
@@ -541,6 +541,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
                                      controller: 'registry/repositories'
 
+      resources :harbor_registry, only: [:index, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
+                                  controller: 'harbor/repositories'
+
       namespace :registry do
         resources :repository, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope
           # We default to JSON format in the controller to avoid ambiguity.
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 401471d02d9..a0f1ea4fa06 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -29,8 +29,6 @@
   - 1
 - - analytics_code_review_metrics
   - 1
-- - analytics_cycle_analytics_group_data_loader
-  - 1
 - - analytics_devops_adoption_create_snapshot
   - 1
 - - analytics_usage_trends_counter_job
@@ -365,6 +363,8 @@
   - 1
 - - projects_process_sync_events
   - 1
+- - projects_refresh_build_artifacts_size_statistics
+  - 1
 - - projects_schedule_bulk_repository_shard_moves
   - 1
 - - projects_update_repository_storage
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 7b559c8881b..360c5be05d4 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -44,7 +44,6 @@ const { DEV_SERVER_HOST, DEV_SERVER_PUBLIC_ADDR } = process.env;
 const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10);
 const DEV_SERVER_ALLOWED_HOSTS =
   process.env.DEV_SERVER_ALLOWED_HOSTS && process.env.DEV_SERVER_ALLOWED_HOSTS.split(',');
-const DEV_SERVER_HTTPS = process.env.DEV_SERVER_HTTPS && process.env.DEV_SERVER_HTTPS !== 'false';
 const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD !== 'false';
 const INCREMENTAL_COMPILER_ENABLED =
   IS_DEV_SERVER &&
@@ -364,6 +363,10 @@ module.exports = {
           name: '[name].[contenthash:8].[ext]',
         },
       },
+      {
+        test: /\.(yml|yaml)$/,
+        loader: 'raw-loader',
+      },
     ],
   },
 
@@ -678,6 +681,7 @@ module.exports = {
       IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false),
       // This is used by Sourcegraph because these assets are loaded dnamically
       'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH),
+      ...(IS_PRODUCTION ? {} : { LIVE_RELOAD: DEV_SERVER_LIVERELOAD }),
     }),
 
     /* Pikaday has a optional dependency to moment.
@@ -709,8 +713,14 @@ module.exports = {
     },
     host: DEV_SERVER_HOST || 'localhost',
     port: DEV_SERVER_PORT || 3808,
-    https: DEV_SERVER_HTTPS,
+    // Setting up hot module reloading
+    // HMR works by setting up a websocket server and injecting
+    // a client script which connects to that server.
+    // The server will push messages to the client to reload parts
+    // of the JavaScript or reload the page if necessary
+    webSocketServer: DEV_SERVER_LIVERELOAD ? 'ws' : false,
     hot: DEV_SERVER_LIVERELOAD,
+    liveReload: DEV_SERVER_LIVERELOAD,
     // The following settings are mainly needed for HMR support in gitpod.
     // Per default only local hosts are allowed, but here we could
     // allow different hosts (e.g. ['.gitpod'], all of gitpod),
author	GitLab Bot <gitlab-bot@gitlab.com>	2022-03-18 20:02:30 +0000
committer	GitLab Bot <gitlab-bot@gitlab.com>	2022-03-18 20:02:30 +0000
commit	41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch)
tree	9c8d89a8624828992f06d892cd2f43818ff5dcc8 /config
parent	0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff)
download	gitlab-ce-41fe97390ceddf945f3d967b8fdb3de4c66b7dea.tar.gz