Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

author: GitLab Bot <gitlab-bot@gitlab.com> 2021-11-18 13:16:36 +0000
committer: GitLab Bot <gitlab-bot@gitlab.com> 2021-11-18 13:16:36 +0000
commit: 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch)
tree: 07e7870bca8aed6d61fdcc810731c50d2c40af47 /config
parent: 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff)
download: gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz
245 files changed, 1740 insertions, 456 deletions
diff --git a/config/application.rb b/config/application.rb
index dba9550a3dc..dde1eae30e7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,6 +16,38 @@ Bundler.require(*Rails.groups)
 
 module Gitlab
   class Application < Rails::Application
+    config.load_defaults 6.1
+
+    # This section contains configuration from Rails upgrades to override the new defaults so that we
+    # keep existing behavior.
+    #
+    # For boolean values, the new default is the opposite of the value being set in this section.
+    # For other types, the new default is noted in the comments. These are also documented in
+    # https://guides.rubyonrails.org/configuring.html#results-of-config-load-defaults
+    #
+    # To switch a setting to the new default value, we just need to delete the specific line here.
+
+    # Rails 6.1
+    config.action_dispatch.cookies_same_site_protection = nil # New default is :lax
+    ActiveSupport.utc_to_local_returns_utc_offset_times = false
+    config.action_controller.urlsafe_csrf_tokens = false
+    config.action_view.preload_links_header = false
+
+    # Rails 5.2
+    config.action_dispatch.use_authenticated_cookie_encryption = false
+    config.active_support.use_authenticated_message_encryption = false
+    config.active_support.hash_digest_class = ::Digest::MD5 # New default is ::Digest::SHA1
+    config.action_controller.default_protect_from_forgery = false
+    config.action_view.form_with_generates_ids = false
+
+    # Rails 5.1
+    config.assets.unknown_asset_fallback = true
+
+    # Rails 5.0
+    config.action_controller.per_form_csrf_tokens = false
+    config.action_controller.forgery_protection_origin_check = false
+    ActiveSupport.to_time_preserves_timezone = false
+
     require_dependency Rails.root.join('lib/gitlab')
     require_dependency Rails.root.join('lib/gitlab/utils')
     require_dependency Rails.root.join('lib/gitlab/action_cable/config')
@@ -28,6 +60,7 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/redis/sessions')
     require_dependency Rails.root.join('lib/gitlab/current_settings')
     require_dependency Rails.root.join('lib/gitlab/middleware/read_only')
+    require_dependency Rails.root.join('lib/gitlab/middleware/compressed_json')
     require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check')
     require_dependency Rails.root.join('lib/gitlab/middleware/same_site_cookies')
     require_dependency Rails.root.join('lib/gitlab/middleware/handle_ip_spoof_attack_error')
@@ -36,8 +69,6 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/runtime')
     require_dependency Rails.root.join('lib/gitlab/patch/legacy_database_config')
 
-    config.autoloader = :zeitwerk
-
     # To be removed in 15.0
     # This preload is needed to convert legacy `database.yml`
     # from `production: adapter: postgresql`
@@ -189,17 +220,18 @@ module Gitlab
     # regardless if schema_search_path is set, or not.
     config.active_record.dump_schemas = :all
 
-    # Use new connection handling so that we can use Rails 6.1+ multiple
-    # database support.
-    config.active_record.legacy_connection_handling = false
-
-    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+    # Override default Active Record settings
+    # We cannot do this in an initializer because some models are already loaded by then
+    config.active_record.cache_versioning = false
+    config.active_record.collection_cache_versioning = false
+    config.active_record.has_many_inversing = false
+    config.active_record.belongs_to_required_by_default = false
 
     # Enable the asset pipeline
     config.assets.enabled = true
 
     # Support legacy unicode file named img emojis, `1F939.png`
-    config.assets.paths << Gemojione.images_path
+    config.assets.paths << TanukiEmoji.images_path
     config.assets.paths << "#{config.root}/vendor/assets/fonts"
 
     config.assets.precompile << "application_utilities.css"
@@ -222,7 +254,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/build.css"
     config.assets.precompile << "page_bundles/ci_status.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
-    config.assets.precompile << "page_bundles/dev_ops_report.css"
+    config.assets.precompile << "page_bundles/dev_ops_reports.css"
     config.assets.precompile << "page_bundles/environments.css"
     config.assets.precompile << "page_bundles/epics.css"
     config.assets.precompile << "page_bundles/error_tracking_details.css"
@@ -255,6 +287,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/security_discover.css"
     config.assets.precompile << "page_bundles/signup.css"
     config.assets.precompile << "page_bundles/terminal.css"
+    config.assets.precompile << "page_bundles/terms.css"
     config.assets.precompile << "page_bundles/todos.css"
     config.assets.precompile << "page_bundles/wiki.css"
     config.assets.precompile << "page_bundles/xterm.css"
@@ -318,6 +351,8 @@ module Gitlab
 
     config.middleware.insert_after Rack::Sendfile, ::Gitlab::Middleware::RackMultipartTempfileFactory
 
+    config.middleware.insert_before Rack::Runtime, ::Gitlab::Middleware::CompressedJson
+
     # Allow access to GitLab API from other domains
     config.middleware.insert_before Warden::Manager, Rack::Cors do
       headers_to_expose = %w[Link X-Total X-Total-Pages X-Per-Page X-Page X-Next-Page X-Prev-Page X-Gitlab-Blob-Id X-Gitlab-Commit-Id X-Gitlab-Content-Sha256 X-Gitlab-Encoding X-Gitlab-File-Name X-Gitlab-File-Path X-Gitlab-Last-Commit-Id X-Gitlab-Ref X-Gitlab-Size]
@@ -376,6 +411,7 @@ module Gitlab
     config.cache_store = :redis_cache_store, Gitlab::Redis::Cache.active_support_config
 
     config.active_job.queue_adapter = :sidekiq
+    config.action_mailer.deliver_later_queue_name = :mailers
 
     # This is needed for gitlab-shell
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
diff --git a/config/boot.rb b/config/boot.rb
index afa3c04c3c7..ec9470bc506 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'bundler_setup'
-require 'bootsnap/setup' if ENV['RAILS_ENV'] != 'production' || %w(1 yes true).include?(ENV['ENABLE_BOOTSNAP'])
+
+enable_bootsnap_default_value = ENV['RAILS_ENV'] != 'production' ? '1' : '0'
+require 'bootsnap/setup' if %w(1 yes true).include?(ENV.fetch('ENABLE_BOOTSNAP', enable_bootsnap_default_value))
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 573286a4c11..894e60b61f2 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -37,12 +37,6 @@
     :versions: []
     :when: 2016-05-02 05:31:54.498490000 Z
 - - :permit
-  - LGPL
-  - :who: Connor Shea
-    :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1
-    :versions: []
-    :when: 2016-05-02 05:32:48.645841000 Z
-- - :permit
   - ISC
   - :who: Connor Shea
     :why: http://www.gnu.org/licenses/license-list.html#ISC
@@ -55,24 +49,12 @@
     :versions: []
     :when: 2016-05-02 05:44:38.246021000 Z
 - - :permit
-  - LGPL-2.1+
-  - :who: Connor Shea
-    :why: Equivalent to LGPL.
-    :versions: []
-    :when: 2016-05-02 05:52:56.303239000 Z
-- - :permit
   - BSD
   - :who: Connor Shea
     :why: https://opensource.org/licenses/BSD-2-Clause
     :versions: []
     :when: 2016-05-02 05:55:09.796363000 Z
 - - :permit
-  - LGPLv2+
-  - :who: Stan Hu
-    :why: Equivalent to LGPLv2
-    :versions: []
-    :when: 2016-06-07 17:14:10.907682000 Z
-- - :permit
   - Artistic 2.0
   - :who: Josh Frye
     :why: Disk/mount information display on Admin pages
@@ -211,14 +193,19 @@
     :why: https://github.com/pieroxy/lz-string/blob/master/LICENSE.txt
     :versions: []
     :when: 2018-08-03 08:22:44.973457000 Z
-- - :license
+- - :add_package
   - smooshpack
-  - LGPL
-  - :who: Phil Hughes
-    :why: https://github.com/CompuIves/codesandbox-client/blob/master/packages/sandpack/LICENSE.md
+  - 0.0.62
+  - &1
+    :who: Phil Hughes
+    :why: https://github.com/codesandbox/codesandbox-client/blob/006adee03295b5d42bb311a526774747758fd1a0/standalone-packages/sandpack/LICENSE.md
     :versions: []
     :when: 2018-08-03 08:24:29.578991000 Z
 - - :license
+  - smooshpack
+  - LGPL
+  - *1
+- - :license
   - codesandbox-import-util-types
   - LGPL
   - :who: Phil Hughes
@@ -317,3 +304,61 @@
     :why: https://github.com/xijo/reverse_markdown/blob/master/LICENSE
     :versions: []
     :when: 2021-02-03 08:47:28.792907000 Z
+- - :approve
+  - sidekiq
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:53:54.127540759 Z
+- - :approve
+  - gitlab-sidekiq-fetcher
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:54:27.222104249 Z
+- - :approve
+  - device_detector
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:54:52.533334287 Z
+- - :approve
+  - gpgme
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:54:43.878212822 Z
+- - :approve
+  - rchardet
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:54:35.324449740 Z
+- - :approve
+  - timfel-krb5-auth
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 13:55:10.859429290 Z
+- - :approve
+  - codesandbox-import-util-types
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 14:03:20.304435279 Z
+- - :approve
+  - codesandbox-import-utils
+  - :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-08 14:03:25.577163700 Z
+- - :approve
+  - smooshpack
+  - &2
+    :who: Sean McGivern
+    :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/672
+    :versions: []
+    :when: 2021-11-10 10:09:31.584355110 Z
+- - :approve
+  - 0.0.62
+  - *2
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 92de88394c6..076957f3057 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -42,8 +42,6 @@ Rails.application.configure do
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
-  # For having correct urls in mails
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
   # Open sent mails in browser
   config.action_mailer.delivery_method = :letter_opener_web
   # Log mail delivery errors
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9fa8a1b762c..2935e0c7636 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -49,7 +49,7 @@ Rails.application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
-  config.eager_load = Gitlab::Utils.to_boolean(ENV['GITLAB_TEST_EAGER_LOAD'], default: true)
+  config.eager_load = Gitlab::Utils.to_boolean(ENV['GITLAB_TEST_EAGER_LOAD'], default: ENV['CI'].present?)
 
   config.cache_store = :null_store
 
@@ -59,8 +59,4 @@ Rails.application.configure do
     config.logger = ActiveSupport::TaggedLogging.new(Logger.new(nil))
     config.log_level = :fatal
   end
-
-  # Mount the ActionCable Engine in-app so that we don't have to spawn another Puma
-  # process for feature specs
-  ENV['ACTION_CABLE_IN_APP'] = 'true'
 end
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index e61048a6427..04804e373ab 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -15,7 +15,6 @@
 - authentication_and_authorization
 - auto_devops
 - backup_restore
-- boards
 - build_artifacts
 - chatops
 - cloud_native_installation
@@ -44,7 +43,6 @@
 - dynamic_application_security_testing
 - editor_extension
 - environment_management
-- epics
 - error_tracking
 - experimentation_activation
 - experimentation_adoption
@@ -59,6 +57,7 @@
 - gitaly
 - gitlab_docs
 - global_search
+- google_cloud
 - helm_chart_registry
 - horse
 - importers
@@ -69,7 +68,6 @@
 - intel_code_security
 - interactive_application_security_testing
 - internationalization
-- issue_tracking
 - jenkins_importer
 - kubernetes_management
 - license
@@ -91,16 +89,17 @@
 - pipeline_abuse_prevention
 - pipeline_authoring
 - planning_analytics
+- portfolio_management
 - privacy_control_center
 - product_analytics
 - projects
 - purchase
 - quality_management
+- redis
 - release_evidence
 - release_orchestration
 - requirements_management
 - review_apps
-- roadmaps
 - runbooks
 - runner
 - scalability
@@ -118,7 +117,7 @@
 - static_site_editor
 - subgroups
 - synthetic_monitoring
-- time_tracking
+- team_planning
 - tracing
 - usability_testing
 - usage_ping
diff --git a/config/feature_flags/development/add_namespace_and_project_to_snowplow_tracking.yml b/config/feature_flags/development/add_namespace_and_project_to_snowplow_tracking.yml
deleted file mode 100644
index ebffae2a446..00000000000
--- a/config/feature_flags/development/add_namespace_and_project_to_snowplow_tracking.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: add_namespace_and_project_to_snowplow_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68277
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338670
-milestone: '14.3'
-type: development
-group: group::product intelligence
-default_enabled: false
diff --git a/config/feature_flags/development/linear_group_ancestor_scopes.yml b/config/feature_flags/development/admin_deploy_keys_vue.yml
index f23399c1e6f..c57ed728ffb 100644
--- a/config/feature_flags/development/linear_group_ancestor_scopes.yml
+++ b/config/feature_flags/development/admin_deploy_keys_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_group_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70495
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341115
-milestone: '14.4'
+name: admin_deploy_keys_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73580
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344855
+milestone: '14.5'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/jira_issue_details_edit_labels.yml b/config/feature_flags/development/api_v3_commits_skip_diff_files.yml
index c43d01bf969..a3a953e983c 100644
--- a/config/feature_flags/development/jira_issue_details_edit_labels.yml
+++ b/config/feature_flags/development/api_v3_commits_skip_diff_files.yml
@@ -1,8 +1,8 @@
 ---
-name: jira_issue_details_edit_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65298
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335069
-milestone: '14.1'
+name: api_v3_commits_skip_diff_files
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67647
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344617
+milestone: '14.5'
 type: development
 group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/atomic_sidekiq_scheduler.yml b/config/feature_flags/development/atomic_sidekiq_scheduler.yml
new file mode 100644
index 00000000000..ab516f61144
--- /dev/null
+++ b/config/feature_flags/development/atomic_sidekiq_scheduler.yml
@@ -0,0 +1,8 @@
+---
+name: atomic_sidekiq_scheduler
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72380
+rollout_issue_url:
+milestone: '14.5'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/between_commits_via_list_commits.yml b/config/feature_flags/development/between_commits_via_list_commits.yml
new file mode 100644
index 00000000000..f048fd4e1b6
--- /dev/null
+++ b/config/feature_flags/development/between_commits_via_list_commits.yml
@@ -0,0 +1,8 @@
+---
+name: between_commits_via_list_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74273
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345458
+milestone: '14.5'
+type: development
+group: group::gitaly
+default_enabled: false
diff --git a/config/feature_flags/development/suppress_apollo_errors_during_navigation.yml b/config/feature_flags/development/bootstrap_confirmation_modals.yml
index 21548fa4dbb..e67fd03fea6 100644
--- a/config/feature_flags/development/suppress_apollo_errors_during_navigation.yml
+++ b/config/feature_flags/development/bootstrap_confirmation_modals.yml
@@ -1,8 +1,8 @@
 ---
-name: suppress_apollo_errors_during_navigation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72031
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342745
-milestone: '14.4'
+name: bootstrap_confirmation_modals
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73167
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344658
+milestone: '14.5'
 type: development
 group: group::foundations
 default_enabled: false
diff --git a/config/feature_flags/development/broadcast_issue_updates.yml b/config/feature_flags/development/broadcast_issue_updates.yml
index b7c6ccf2353..c38263528a9 100644
--- a/config/feature_flags/development/broadcast_issue_updates.yml
+++ b/config/feature_flags/development/broadcast_issue_updates.yml
@@ -1,8 +1,8 @@
 ---
 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/delivery/-/issues/1210
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/3413
 milestone: '13.0'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml b/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml
deleted file mode 100644
index 48c7dbcf740..00000000000
--- a/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_create_external_pr_pipeline_async
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68567
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338908
-milestone: '14.3'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/query_project_ci_feature_usages_for_coverage.yml b/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml
index 1b720d6276b..b064e6bf09f 100644
--- a/config/feature_flags/development/query_project_ci_feature_usages_for_coverage.yml
+++ b/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml
@@ -1,8 +1,8 @@
 ---
-name: query_project_ci_feature_usages_for_coverage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69890
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339974
-milestone: '14.3'
+name: ci_destroy_unlocked_job_artifacts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72406
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338165
+milestone: '14.5'
 type: development
 group: group::testing
 default_enabled: false
diff --git a/config/feature_flags/development/pipeline_editor_mini_graph.yml b/config/feature_flags/development/ci_predefined_vars_in_builder.yml
index 6f31cb18d82..5aacf6ee681 100644
--- a/config/feature_flags/development/pipeline_editor_mini_graph.yml
+++ b/config/feature_flags/development/ci_predefined_vars_in_builder.yml
@@ -1,7 +1,7 @@
 ---
-name: pipeline_editor_mini_graph
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71622
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342217
+name: ci_predefined_vars_in_builder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72348
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231300
 milestone: '14.4'
 type: development
 group: group::pipeline authoring
diff --git a/config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml b/config/feature_flags/development/ci_store_trace_outside_transaction.yml
index 235b37dfb1d..89b135850fe 100644
--- a/config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml
+++ b/config/feature_flags/development/ci_store_trace_outside_transaction.yml
@@ -1,8 +1,8 @@
 ---
-name: decomposed_ci_query_in_pipelines_for_merge_request_finder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68549
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341341
-milestone: '14.4'
+name: ci_store_trace_outside_transaction
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66203
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336280
+milestone: '15.4'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_synchronous_artifact_parsing.yml b/config/feature_flags/development/ci_synchronous_artifact_parsing.yml
deleted file mode 100644
index ab3a35e409b..00000000000
--- a/config/feature_flags/development/ci_synchronous_artifact_parsing.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_synchronous_artifact_parsing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26247
-rollout_issue_url: 
-milestone: '12.9'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml b/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml
new file mode 100644
index 00000000000..9157928f352
--- /dev/null
+++ b/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml
@@ -0,0 +1,8 @@
+---
+name: ci_update_unlocked_job_artifacts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70235
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343465
+milestone: '14.5'
+type: development
+group: group::testing
+default_enabled: false
diff --git a/config/feature_flags/development/ci_new_artifact_file_reader.yml b/config/feature_flags/development/ci_validate_job_length.yml
index d475f3f370d..5e29d3c1435 100644
--- a/config/feature_flags/development/ci_new_artifact_file_reader.yml
+++ b/config/feature_flags/development/ci_validate_job_length.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_new_artifact_file_reader
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46552
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273755
-milestone: '13.6'
+name: ci_validate_job_length
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73599
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344665
+milestone: '14.5'
 type: development
 group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/cached_issues_state_count.yml b/config/feature_flags/development/cluster_vulnerabilities.yml
index 34d96b601d9..919cdc1d009 100644
--- a/config/feature_flags/development/cached_issues_state_count.yml
+++ b/config/feature_flags/development/cluster_vulnerabilities.yml
@@ -1,8 +1,8 @@
 ---
-name: cached_issues_state_count
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67418
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333089
-milestone: '14.3'
+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'
 type: development
-group: group::product planning
+group: group::container security
 default_enabled: false
diff --git a/config/feature_flags/development/configure_iac_scanning_via_mr.yml b/config/feature_flags/development/configure_iac_scanning_via_mr.yml
new file mode 100644
index 00000000000..cef22644b8f
--- /dev/null
+++ b/config/feature_flags/development/configure_iac_scanning_via_mr.yml
@@ -0,0 +1,8 @@
+---
+name: configure_iac_scanning_via_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73155
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343966
+milestone: '14.5'
+type: development
+group: group::static analysis
+default_enabled: true
diff --git a/config/feature_flags/development/configure_sentry_in_application_settings.yml b/config/feature_flags/development/configure_sentry_in_application_settings.yml
new file mode 100644
index 00000000000..82b2261994b
--- /dev/null
+++ b/config/feature_flags/development/configure_sentry_in_application_settings.yml
@@ -0,0 +1,8 @@
+---
+name: configure_sentry_in_application_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73381
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344832
+milestone: '14.5'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_expiration_policies_caching.yml b/config/feature_flags/development/container_registry_expiration_policies_caching.yml
deleted file mode 100644
index 6e8b0efe94d..00000000000
--- a/config/feature_flags/development/container_registry_expiration_policies_caching.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: container_registry_expiration_policies_caching
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340606
-milestone: '14.3'
-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
new file mode 100644
index 00000000000..3fbf929ca2e
--- /dev/null
+++ b/config/feature_flags/development/create_project_namespace_on_project_create.yml
@@ -0,0 +1,8 @@
+---
+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: false
diff --git a/config/feature_flags/development/dast_view_scans.yml b/config/feature_flags/development/dast_view_scans.yml
index 39c14097b60..736fcb01091 100644
--- a/config/feature_flags/development/dast_view_scans.yml
+++ b/config/feature_flags/development/dast_view_scans.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340388
 milestone: '14.3'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml b/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml
new file mode 100644
index 00000000000..f1e3be78da8
--- /dev/null
+++ b/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml
@@ -0,0 +1,8 @@
+---
+name: dependency_proxy_manifest_workhorse
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73033
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344216
+milestone: '14.4'
+type: development
+group: group::package
+default_enabled: true
diff --git a/config/feature_flags/development/dependency_proxy_workhorse.yml b/config/feature_flags/development/dependency_proxy_workhorse.yml
index a3545d32cd5..a14f38fa001 100644
--- a/config/feature_flags/development/dependency_proxy_workhorse.yml
+++ b/config/feature_flags/development/dependency_proxy_workhorse.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339639
 milestone: '14.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/update_deployment_after_transaction_commit.yml b/config/feature_flags/development/deployments_archive.yml
index c07622fc9b4..ad6b5fb47d9 100644
--- a/config/feature_flags/development/update_deployment_after_transaction_commit.yml
+++ b/config/feature_flags/development/deployments_archive.yml
@@ -1,8 +1,8 @@
 ---
-name: update_deployment_after_transaction_commit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71450
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342021
-milestone: '14.4'
+name: deployments_archive
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345027
+milestone: '14.5'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/detect_cross_database_modification.yml b/config/feature_flags/development/detect_cross_database_modification.yml
new file mode 100644
index 00000000000..7f74e136291
--- /dev/null
+++ b/config/feature_flags/development/detect_cross_database_modification.yml
@@ -0,0 +1,8 @@
+---
+name: detect_cross_database_modification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73316
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344620
+milestone: '14.5'
+type: development
+group: group::sharding
+default_enabled: false
diff --git a/config/feature_flags/development/display_outdated_line_diff.yml b/config/feature_flags/development/display_outdated_line_diff.yml
new file mode 100644
index 00000000000..6baa258c52b
--- /dev/null
+++ b/config/feature_flags/development/display_outdated_line_diff.yml
@@ -0,0 +1,8 @@
+---
+name: display_outdated_line_diff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72597
+rollout_issue_url:
+milestone: '14.5'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml b/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml
new file mode 100644
index 00000000000..a265d9528f7
--- /dev/null
+++ b/config/feature_flags/development/environments_by_deployments_finder_exists_optimization.yml
@@ -0,0 +1,8 @@
+---
+name: environments_by_deployments_finder_exists_optimization
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72781/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343544
+milestone: '14.5'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml b/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml
new file mode 100644
index 00000000000..c106d5131ff
--- /dev/null
+++ b/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml
@@ -0,0 +1,8 @@
+---
+name: github_importer_use_diff_note_with_suggestions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71765
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344309
+milestone: '14.5'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/jira_issue_details_edit_status.yml b/config/feature_flags/development/jira_issue_details_edit_status.yml
deleted file mode 100644
index 311e243c570..00000000000
--- a/config/feature_flags/development/jira_issue_details_edit_status.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jira_issue_details_edit_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60092
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330628
-milestone: '14.1'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_asymmetric_jwt.yml b/config/feature_flags/development/jira_use_first_ref_by_oid.yml
index e204a7d6fac..10e2ad1b8ad 100644
--- a/config/feature_flags/development/jira_connect_asymmetric_jwt.yml
+++ b/config/feature_flags/development/jira_use_first_ref_by_oid.yml
@@ -1,8 +1,8 @@
 ---
-name: jira_connect_asymmetric_jwt
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71080
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342808
-milestone: '14.4'
+name: jira_use_first_ref_by_oid
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72739
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343585
+milestone: '14.5'
 type: development
 group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/retarget_merge_requests.yml b/config/feature_flags/development/jupyter_clean_diffs.yml
index cbad472a56e..0f3f6fe3057 100644
--- a/config/feature_flags/development/retarget_merge_requests.yml
+++ b/config/feature_flags/development/jupyter_clean_diffs.yml
@@ -1,8 +1,8 @@
 ---
-name: retarget_merge_requests
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53710
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320895
-milestone: '13.9'
+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'
 type: development
-group: group::memory
+group: group::incubation
 default_enabled: true
diff --git a/config/feature_flags/development/linear_application_setting_ancestor_scopes.yml b/config/feature_flags/development/linear_application_setting_ancestor_scopes.yml
deleted file mode 100644
index 18c64df78d7..00000000000
--- a/config/feature_flags/development/linear_application_setting_ancestor_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_application_setting_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70579
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341346
-milestone: '14.4'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml b/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml
deleted file mode 100644
index d45b8d71a20..00000000000
--- a/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_group_plans_preloaded_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70685
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341349
-milestone: '14.4'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml b/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml
deleted file mode 100644
index 6bd5e164324..00000000000
--- a/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_members_finder_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70583
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341347
-milestone: '14.4'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml b/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml
deleted file mode 100644
index 41b6f3b32d9..00000000000
--- a/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_participants_service_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70684
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341348
-milestone: '14.4'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/managed_alerts_deprecation.yml b/config/feature_flags/development/loose_foreign_key_cleanup.yml
index f849aa33141..915ed662333 100644
--- a/config/feature_flags/development/managed_alerts_deprecation.yml
+++ b/config/feature_flags/development/loose_foreign_key_cleanup.yml
@@ -1,8 +1,8 @@
 ---
-name: managed_alerts_deprecation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62528
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331863
-milestone: '14.0'
+name: loose_foreign_key_cleanup
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69165
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343545
+milestone: '14.4'
 type: development
-group: group::monitor
+group: group::sharding
 default_enabled: true
diff --git a/config/feature_flags/development/mr_attention_requests.yml b/config/feature_flags/development/mr_attention_requests.yml
new file mode 100644
index 00000000000..b80300d1acf
--- /dev/null
+++ b/config/feature_flags/development/mr_attention_requests.yml
@@ -0,0 +1,8 @@
+---
+name: mr_attention_requests
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72773
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343528
+milestone: '14.4'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/mr_changes_fluid_layout.yml b/config/feature_flags/development/mr_changes_fluid_layout.yml
index 87f0c0c6569..dcb9dee2ece 100644
--- a/config/feature_flags/development/mr_changes_fluid_layout.yml
+++ b/config/feature_flags/development/mr_changes_fluid_layout.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341809
 milestone: '14.4'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/cached_loading_hints.yml b/config/feature_flags/development/multiple_gpg_signatures.yml
index ba4eaece55a..3b9b8d0a465 100644
--- a/config/feature_flags/development/cached_loading_hints.yml
+++ b/config/feature_flags/development/multiple_gpg_signatures.yml
@@ -1,8 +1,8 @@
 ---
-name: cached_loading_hints
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61609
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330802
-milestone: '13.12'
+name: multiple_gpg_signatures
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74095
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345261
+milestone: '14.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/new_customersdot_staging_url.yml b/config/feature_flags/development/new_customersdot_staging_url.yml
deleted file mode 100644
index 288d7f66f01..00000000000
--- a/config/feature_flags/development/new_customersdot_staging_url.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: new_customersdot_staging_url
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71827
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342513
-milestone: '14.4'
-type: development
-group: group::fulfillment
-default_enabled: false
diff --git a/config/feature_flags/development/new_environments_table.yml b/config/feature_flags/development/new_environments_table.yml
new file mode 100644
index 00000000000..b97a4d49cd8
--- /dev/null
+++ b/config/feature_flags/development/new_environments_table.yml
@@ -0,0 +1,8 @@
+---
+name: new_environments_table
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.4'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/new_graphql_keyset_pagination.yml b/config/feature_flags/development/new_graphql_keyset_pagination.yml
index f4afcba68cf..7f1c73756b3 100644
--- a/config/feature_flags/development/new_graphql_keyset_pagination.yml
+++ b/config/feature_flags/development/new_graphql_keyset_pagination.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323730
 milestone: '13.10'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/paginated_tree_graphql_query.yml b/config/feature_flags/development/packages_npm_abbreviated_metadata.yml
index d56d8fc336c..ad191adfa20 100644
--- a/config/feature_flags/development/paginated_tree_graphql_query.yml
+++ b/config/feature_flags/development/packages_npm_abbreviated_metadata.yml
@@ -1,8 +1,8 @@
 ---
-name: paginated_tree_graphql_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66751
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337214
-milestone: '14.2'
+name: packages_npm_abbreviated_metadata
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73639
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344827
+milestone: '14.5'
 type: development
-group: group::source code
+group: group::package
 default_enabled: true
diff --git a/config/feature_flags/development/paginated_issue_discussions.yml b/config/feature_flags/development/paginated_issue_discussions.yml
new file mode 100644
index 00000000000..f4e765bd7f2
--- /dev/null
+++ b/config/feature_flags/development/paginated_issue_discussions.yml
@@ -0,0 +1,8 @@
+---
+name: paginated_issue_discussions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69933
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345351
+milestone: '14.5'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/query_analyzer_gitlab_schema_metrics.yml b/config/feature_flags/development/query_analyzer_gitlab_schema_metrics.yml
new file mode 100644
index 00000000000..b784105368c
--- /dev/null
+++ b/config/feature_flags/development/query_analyzer_gitlab_schema_metrics.yml
@@ -0,0 +1,8 @@
+---
+name: query_analyzer_gitlab_schema_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73839
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345034
+milestone: '14.5'
+type: development
+group: group::sharding
+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
index 4fe8e19213a..12d3da86cad 100644
--- a/config/feature_flags/development/real_time_issue_sidebar.yml
+++ b/config/feature_flags/development/real_time_issue_sidebar.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1210
 milestone: '13.0'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/release_evidence.yml b/config/feature_flags/development/release_evidence.yml
deleted file mode 100644
index 3ba5ed86c71..00000000000
--- a/config/feature_flags/development/release_evidence.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: release_evidence
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26509
-rollout_issue_url: 
-milestone: '12.10'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/report_on_long_redis_durations.yml b/config/feature_flags/development/report_on_long_redis_durations.yml
deleted file mode 100644
index 0f93c591d63..00000000000
--- a/config/feature_flags/development/report_on_long_redis_durations.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: report_on_long_redis_durations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67512
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1183
-milestone: '14.2'
-type: development
-group: team::Scalability
-default_enabled: false
diff --git a/config/feature_flags/development/request_apdex_counters.yml b/config/feature_flags/development/request_apdex_counters.yml
deleted file mode 100644
index 07d6cb7ac5e..00000000000
--- a/config/feature_flags/development/request_apdex_counters.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: request_apdex_counters
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69154
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1099
-milestone: '14.3'
-type: development
-group: team::Scalability
-default_enabled: false
diff --git a/config/feature_flags/development/finding_ci_pipeline_disable_joins.yml b/config/feature_flags/development/security_finding_build_disable_joins.yml
index 8987b729cac..7432882eca8 100644
--- a/config/feature_flags/development/finding_ci_pipeline_disable_joins.yml
+++ b/config/feature_flags/development/security_finding_build_disable_joins.yml
@@ -1,8 +1,8 @@
 ---
-name: finding_ci_pipeline_disable_joins
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70216
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338665
-milestone: '14.3'
+name: security_finding_build_disable_joins
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72738
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342380
+milestone: '14.4'
 type: development
 group: group::threat insights
 default_enabled: true
diff --git a/config/feature_flags/development/show_relevant_approval_rule_approvers.yml b/config/feature_flags/development/show_relevant_approval_rule_approvers.yml
index 2fef085381d..233f6916896 100644
--- a/config/feature_flags/development/show_relevant_approval_rule_approvers.yml
+++ b/config/feature_flags/development/show_relevant_approval_rule_approvers.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329153
 milestone: '13.12'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/linear_ee_group_ancestor_scopes.yml b/config/feature_flags/development/sidekiq_push_bulk_in_batches.yml
index 46294b0aef0..ea4c5253856 100644
--- a/config/feature_flags/development/linear_ee_group_ancestor_scopes.yml
+++ b/config/feature_flags/development/sidekiq_push_bulk_in_batches.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_ee_group_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70708
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341350
-milestone: '14.4'
+name: sidekiq_push_bulk_in_batches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72263
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343740
+milestone: '14.5'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/specialized_service_for_project_member_auth_refresh.yml b/config/feature_flags/development/specialized_service_for_project_member_auth_refresh.yml
deleted file mode 100644
index 2d0c4cf14c3..00000000000
--- a/config/feature_flags/development/specialized_service_for_project_member_auth_refresh.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: specialized_service_for_project_member_auth_refresh
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67477
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337730
-milestone: '14.2'
-type: development
-group: group::access
-default_enabled: false
diff --git a/config/feature_flags/development/surface_environment_creation_failure.yml b/config/feature_flags/development/surface_environment_creation_failure.yml
index 2c312d432ef..acb8600b0bb 100644
--- a/config/feature_flags/development/surface_environment_creation_failure.yml
+++ b/config/feature_flags/development/surface_environment_creation_failure.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340169
 milestone: '14.4'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/tags_finder_gitaly.yml b/config/feature_flags/development/tag_list_keyset_pagination.yml
index 065a253a69f..54bd96d82cf 100644
--- a/config/feature_flags/development/tags_finder_gitaly.yml
+++ b/config/feature_flags/development/tag_list_keyset_pagination.yml
@@ -1,8 +1,8 @@
 ---
-name: tags_finder_gitaly
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69101
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339741
-milestone: '14.3'
+name: tag_list_keyset_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74239
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345595
+milestone: '14.5'
 type: development
 group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/terms_of_service_vue.yml b/config/feature_flags/development/terms_of_service_vue.yml
new file mode 100644
index 00000000000..01bf3613127
--- /dev/null
+++ b/config/feature_flags/development/terms_of_service_vue.yml
@@ -0,0 +1,8 @@
+---
+name: terms_of_service_vue
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343046
+milestone: '14.5'
+type: development
+group: group::access
+default_enabled: true
diff --git a/config/feature_flags/development/linear_group_tree_ancestor_scopes.yml b/config/feature_flags/development/traversal_ids_btree.yml
index 3a195242fa1..aaecafe04ae 100644
--- a/config/feature_flags/development/linear_group_tree_ancestor_scopes.yml
+++ b/config/feature_flags/development/traversal_ids_btree.yml
@@ -1,8 +1,8 @@
 ---
-name: linear_group_tree_ancestor_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70503
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341117
-milestone: '14.4'
+name: traversal_ids_btree
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69535
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342871
+milestone: '14.5'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/add_actor_based_user_to_snowplow_tracking.yml b/config/feature_flags/development/usage_data_instrumentation.yml
index 9dc20148d56..e2610cbd39c 100644
--- a/config/feature_flags/development/add_actor_based_user_to_snowplow_tracking.yml
+++ b/config/feature_flags/development/usage_data_instrumentation.yml
@@ -1,8 +1,8 @@
 ---
-name: add_actor_based_user_to_snowplow_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71353
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338150
-milestone: '14.4'
+name: usage_data_instrumentation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68808
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345252
+milestone: '14.5'
 type: development
 group: group::product intelligence
 default_enabled: false
diff --git a/config/feature_flags/development/use_cmark_renderer.yml b/config/feature_flags/development/use_cmark_renderer.yml
new file mode 100644
index 00000000000..b47031a6924
--- /dev/null
+++ b/config/feature_flags/development/use_cmark_renderer.yml
@@ -0,0 +1,8 @@
+---
+name: use_cmark_renderer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61792
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345744
+milestone: '14.6'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/project_storage_ui.yml b/config/feature_flags/development/use_model_load_balancing.yml
index 23a5b5c3d29..630e34acff3 100644
--- a/config/feature_flags/development/project_storage_ui.yml
+++ b/config/feature_flags/development/use_model_load_balancing.yml
@@ -1,8 +1,8 @@
 ---
-name: project_storage_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68289
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334889
-milestone: '14.2'
+name: use_model_load_balancing
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73631
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344797
+milestone: '14.5'
 type: development
-group: group::utilization
+group: group::sharding
 default_enabled: false
diff --git a/config/feature_flags/development/package_list_apollo.yml b/config/feature_flags/development/use_multi_store.yml
index 522b08594e2..48db4a092b5 100644
--- a/config/feature_flags/development/package_list_apollo.yml
+++ b/config/feature_flags/development/use_multi_store.yml
@@ -1,8 +1,8 @@
 ---
-name: package_list_apollo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70598
+name: use_multi_store
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73660
 rollout_issue_url:
-milestone: '14.3'
+milestone: '14.5'
 type: development
-group: group::package
+group: group::memory
 default_enabled: false
diff --git a/config/feature_flags/development/use_optimized_group_labels_query.yml b/config/feature_flags/development/use_optimized_group_labels_query.yml
new file mode 100644
index 00000000000..37e2525d03e
--- /dev/null
+++ b/config/feature_flags/development/use_optimized_group_labels_query.yml
@@ -0,0 +1,8 @@
+---
+name: use_optimized_group_labels_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73501
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344957
+milestone: '14.5'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/group_authorized_agents.yml b/config/feature_flags/development/use_traversal_ids_roots.yml
index e1c4620994d..3c0685dc872 100644
--- a/config/feature_flags/development/group_authorized_agents.yml
+++ b/config/feature_flags/development/use_traversal_ids_roots.yml
@@ -1,8 +1,8 @@
 ---
-name: group_authorized_agents
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69047
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340166
-milestone: '14.3'
+name: use_traversal_ids_roots
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74148
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345438
+milestone: '14.5'
 type: development
-group: group::configure
+group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/content_editor_block_tables.yml b/config/feature_flags/development/use_vsa_aggregated_tables.yml
index 176422bbc92..d2adec3633b 100644
--- a/config/feature_flags/development/content_editor_block_tables.yml
+++ b/config/feature_flags/development/use_vsa_aggregated_tables.yml
@@ -1,8 +1,8 @@
 ---
-name: content_editor_block_tables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66187
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338937
-milestone: '14.3'
+name: use_vsa_aggregated_tables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72978
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343429
+milestone: '14.5'
 type: development
-group: group::editor
+group: group::optimize
 default_enabled: false
diff --git a/config/feature_flags/development/variable_inside_variable.yml b/config/feature_flags/development/variable_inside_variable.yml
deleted file mode 100644
index fee4897b3f0..00000000000
--- a/config/feature_flags/development/variable_inside_variable.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: variable_inside_variable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50156
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297382
-milestone: '13.11'
-type: development
-group: group::runner
-default_enabled: true
diff --git a/config/feature_flags/development/workhorse_use_sidechannel.yml b/config/feature_flags/development/workhorse_use_sidechannel.yml
index f39d313bf1a..1ba32be28c1 100644
--- a/config/feature_flags/development/workhorse_use_sidechannel.yml
+++ b/config/feature_flags/development/workhorse_use_sidechannel.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1
 milestone: '14.4'
 type: development
 group: 'group::scalability'
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/experiment/empty_repo_upload.yml b/config/feature_flags/experiment/bypass_registration.yml
index 9655a4d3cb4..b3a0d634248 100644
--- a/config/feature_flags/experiment/empty_repo_upload.yml
+++ b/config/feature_flags/experiment/bypass_registration.yml
@@ -1,8 +1,8 @@
 ---
-name: empty_repo_upload
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52755
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285296
-milestone: '13.9'
+name: bypass_registration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72827
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340560
+milestone: '14.5'
 type: experiment
 group: group::adoption
 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
new file mode 100644
index 00000000000..e65d7cd8d94
--- /dev/null
+++ b/config/feature_flags/experiment/change_continuous_onboarding_link_urls.yml
@@ -0,0 +1,8 @@
+---
+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
new file mode 100644
index 00000000000..9f677bf252a
--- /dev/null
+++ b/config/feature_flags/experiment/confetti_post_signup.yml
@@ -0,0 +1,8 @@
+---
+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/invite_members_for_task.yml b/config/feature_flags/experiment/invite_members_for_task.yml
new file mode 100644
index 00000000000..30743811f26
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_for_task.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_for_task
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339747
+milestone: '14.5'
+type: experiment
+group: group::activation
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
new file mode 100644
index 00000000000..7968a885374
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_in_side_nav.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_in_side_nav
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
+milestone: '14.5'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_team_email.yml b/config/feature_flags/experiment/invite_team_email.yml
new file mode 100644
index 00000000000..f430b6ff88b
--- /dev/null
+++ b/config/feature_flags/experiment/invite_team_email.yml
@@ -0,0 +1,8 @@
+---
+name: invite_team_email
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72470
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345553
+milestone: '14.5'
+type: experiment
+group: group::activation
+default_enabled: false
diff --git a/config/feature_flags/experiment/pipeline_editor_walkthrough.yml b/config/feature_flags/experiment/pipeline_editor_walkthrough.yml
new file mode 100644
index 00000000000..6d8895cbab7
--- /dev/null
+++ b/config/feature_flags/experiment/pipeline_editor_walkthrough.yml
@@ -0,0 +1,8 @@
+---
+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/prominent_create_board_btn.yml b/config/feature_flags/experiment/prominent_create_board_btn.yml
new file mode 100644
index 00000000000..b54dd25be15
--- /dev/null
+++ b/config/feature_flags/experiment/prominent_create_board_btn.yml
@@ -0,0 +1,8 @@
+---
+name: prominent_create_board_btn
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72683"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/343415"
+milestone: "14.5"
+type: experiment
+group: group::product planning
+default_enabled: false
diff --git a/config/feature_flags/development/additional_snowplow_tracking.yml b/config/feature_flags/ops/additional_snowplow_tracking.yml
index 0d021a2f8b0..4dbf91bbff5 100644
--- a/config/feature_flags/development/additional_snowplow_tracking.yml
+++ b/config/feature_flags/ops/additional_snowplow_tracking.yml
@@ -1,8 +1,8 @@
 ---
 name: additional_snowplow_tracking
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/12088
-rollout_issue_url: 
+rollout_issue_url:
 milestone: '11.11'
-type: development
 group: group::product intelligence
 default_enabled: false
+type: ops
diff --git a/config/feature_flags/development/block_anonymous_global_searches.yml b/config/feature_flags/ops/block_anonymous_global_searches.yml
index ee72f1ac60a..ecdf7243ed7 100644
--- a/config/feature_flags/development/block_anonymous_global_searches.yml
+++ b/config/feature_flags/ops/block_anonymous_global_searches.yml
@@ -1,8 +1,8 @@
 ---
 name: block_anonymous_global_searches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41041
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/244276
+rollout_issue_url:
 milestone: '13.4'
-type: development
+type: ops
 group: group::global search
 default_enabled: false
diff --git a/config/feature_flags/ops/product_analytics_tracking.yml b/config/feature_flags/ops/product_analytics_tracking.yml
deleted file mode 100644
index 5d392c4e4a7..00000000000
--- a/config/feature_flags/ops/product_analytics_tracking.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: product_analytics_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46482
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285519
-milestone: '13.7'
-type: ops
-group: group::product intelligence
-default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index bb69c215f8d..4e5e15d261b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1024,6 +1024,9 @@ production: &base
       # - { name: 'bitbucket',
       #     app_id: 'YOUR_APP_ID',
       #     app_secret: 'YOUR_APP_SECRET' }
+      # - { name: 'dingtalk',
+      #     app_id: 'YOUR_APP_ID',
+      #     app_secret: 'YOUR_APP_SECRET' }
       # - { name: 'gitlab',
       #     app_id: 'YOUR_APP_ID',
       #     app_secret: 'YOUR_APP_SECRET',
@@ -1515,6 +1518,9 @@ test:
       - { name: 'bitbucket',
           app_id: 'YOUR_APP_ID',
           app_secret: 'YOUR_APP_SECRET' }
+      - { name: 'dingtalk',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET' }
       - { name: 'gitlab',
           app_id: 'YOUR_APP_ID',
           app_secret: 'YOUR_APP_SECRET',
diff --git a/config/initializers/00_active_record_gitlab_schema.rb b/config/initializers/00_active_record_gitlab_schema.rb
deleted file mode 100644
index f1ddd4d4eb1..00000000000
--- a/config/initializers/00_active_record_gitlab_schema.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# This parameter describes a virtual context to indicate
-# table affinity to other tables.
-#
-# Table affinity limits cross-joins, cross-modifications,
-# foreign keys and validates relationship between tables
-#
-# By default it is undefined
-ActiveRecord::Base.class_attribute :gitlab_schema, default: nil
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb
index f7a1f5f0469..805a9e33347 100644
--- a/config/initializers/0_marginalia.rb
+++ b/config/initializers/0_marginalia.rb
@@ -19,7 +19,10 @@ Marginalia::Comment.components = [:application, :correlation_id, :jid, :endpoint
 # adding :line has some overhead because a regexp on the backtrace has
 # to be run on every SQL query. Only enable this in development because
 # we've seen it slow things down.
-Marginalia::Comment.components << :line if Rails.env.development?
+if Rails.env.development?
+  Marginalia::Comment.components << :line
+  Marginalia::Comment.lines_to_ignore = Regexp.union(Gitlab::BacktraceCleaner::IGNORE_BACKTRACES + %w(lib/ruby/gems/ lib/gem_extensions/ lib/ruby/))
+end
 
 Gitlab::Marginalia.set_application_name
 
diff --git a/config/initializers/0_postgresql_types.rb b/config/initializers/0_postgresql_types.rb
new file mode 100644
index 00000000000..79e7510ee55
--- /dev/null
+++ b/config/initializers/0_postgresql_types.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# As discussed in https://github.com/rails/rails/issues/40687, this
+# patch registers a few types to silence warnings when Rails comes
+# across some PostgreSQL types it does not recognize.
+module PostgreSQLAdapterCustomTypes
+  def initialize_type_map(m = type_map) # rubocop:disable Naming/MethodParameterName
+    m.register_type('xid', ActiveRecord::Type::Integer.new(limit: 8))
+    m.register_type('pg_node_tree', ActiveRecord::Type::String.new)
+    m.register_type('_aclitem', ActiveRecord::Type::String.new)
+    m.register_type('pg_lsn', ActiveRecord::Type::String.new)
+
+    super
+  end
+end
+
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(PostgreSQLAdapterCustomTypes)
diff --git a/config/initializers/0_acts_as_taggable.rb b/config/initializers/1_acts_as_taggable.rb
index 8dee3c52a53..59412aef755 100644
--- a/config/initializers/0_acts_as_taggable.rb
+++ b/config/initializers/1_acts_as_taggable.rb
@@ -10,10 +10,8 @@ ActsAsTaggableOn.tags_counter = false
 raise "Counter cache is not disabled" if
     ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache]
 
-ActsAsTaggableOn::Tagging.include IgnorableColumns
-ActsAsTaggableOn::Tagging.ignore_column :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
-ActsAsTaggableOn::Tagging.ignore_column :taggable_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
-
-# The tags and taggings are supposed to be part of `gitlab_ci`
-ActsAsTaggableOn::Tag.gitlab_schema = :gitlab_ci
-ActsAsTaggableOn::Tagging.gitlab_schema = :gitlab_ci
+# Redirects retrieve_connection to use Ci::ApplicationRecord's connection
+[::ActsAsTaggableOn::Tag, ::ActsAsTaggableOn::Tagging].each do |model|
+  model.connection_specification_name = Ci::ApplicationRecord.connection_specification_name
+  model.singleton_class.delegate :connection, :sticking, to: '::Ci::ApplicationRecord'
+end
diff --git a/config/initializers/1_postgresql_only.rb b/config/initializers/1_postgresql_only.rb
index 7bb851daa08..3be55255ddd 100644
--- a/config/initializers/1_postgresql_only.rb
+++ b/config/initializers/1_postgresql_only.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 raise "PostgreSQL is the only supported database from GitLab 12.1" unless
-  Gitlab::Database.main.postgresql?
+  ApplicationRecord.database.postgresql?
 
 Gitlab::Database.check_postgres_version_and_print_warning
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index d6957491b16..8fb2161b14e 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -571,7 +571,7 @@ Settings.cron_jobs['user_status_cleanup_batch_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['user_status_cleanup_batch_worker']['cron'] ||= '* * * * *'
 Settings.cron_jobs['user_status_cleanup_batch_worker']['job_class'] = 'UserStatusCleanup::BatchWorker'
 Settings.cron_jobs['ssh_keys_expired_notification_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['ssh_keys_expired_notification_worker']['cron'] ||= '0 2 * * *'
+Settings.cron_jobs['ssh_keys_expired_notification_worker']['cron'] ||= '0 2,14 * * *'
 Settings.cron_jobs['ssh_keys_expired_notification_worker']['job_class'] = 'SshKeys::ExpiredNotificationWorker'
 Settings.cron_jobs['namespaces_in_product_marketing_emails_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['cron'] ||= '0 16 * * *'
@@ -588,6 +588,12 @@ 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['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'
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
@@ -713,6 +719,9 @@ Gitlab.ee do
   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'
+  Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/5 * * * *'
+  Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker'
 end
 
 #
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 587d393fd77..28f3da9b3df 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -65,7 +65,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
     Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance.start
     Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance.start
 
-    if Gitlab::Runtime.action_cable?
+    if Gitlab::Runtime.web_server?
       Gitlab::Metrics::Samplers::ActionCableSampler.instance.start
     end
 
diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb
index a7ef5cc332c..fc40d0b69c5 100644
--- a/config/initializers/action_cable.rb
+++ b/config/initializers/action_cable.rb
@@ -3,8 +3,7 @@
 require 'action_cable/subscription_adapter/redis'
 
 Rails.application.configure do
-  # Mount the ActionCable engine when in-app mode is enabled
-  config.action_cable.mount_path = Gitlab::ActionCable::Config.in_app? ? '/-/cable' : nil
+  config.action_cable.mount_path = '/-/cable'
 
   config.action_cable.url = Gitlab::Utils.append_path(Gitlab.config.gitlab.relative_url_root, '/-/cable')
   config.action_cable.worker_pool_size = Gitlab::ActionCable::Config.worker_pool_size
diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb
deleted file mode 100644
index 76171733483..00000000000
--- a/config/initializers/action_view.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-# This file was introduced during upgrading Rails from 5.2 to 6.0.
-# This file can be removed when `config.load_defaults 6.0` is introduced.
-
-# Don't force requests from old versions of IE to be UTF-8 encoded.
-Rails.application.config.action_view.default_enforce_utf8 = false
diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb
index 75991c9da35..8d4b6d61abe 100644
--- a/config/initializers/active_record_lifecycle.rb
+++ b/config/initializers/active_record_lifecycle.rb
@@ -14,7 +14,7 @@ end
 
 if defined?(ActiveRecord::Base)
   Gitlab::Cluster::LifecycleEvents.on_before_fork do
-    raise 'ActiveRecord connection not established. Unable to start.' unless Gitlab::Database.main.exists?
+    raise 'ActiveRecord connection not established. Unable to start.' unless ApplicationRecord.database.exists?
 
     # the following is highly recommended for Rails + "preload_app true"
     # as there's no need for the master process to hold a connection
diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb
index 5e9e7a7a9af..3f98568c500 100644
--- a/config/initializers/console_message.rb
+++ b/config/initializers/console_message.rb
@@ -10,8 +10,8 @@ if Gitlab::Runtime.console?
   puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision}) #{Gitlab.ee? ? 'EE' : 'FOSS'}"
   puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.version)}"
 
-  if Gitlab::Database.main.exists?
-    puts " #{Gitlab::Database.main.human_adapter_name}:".ljust(justify) + Gitlab::Database.main.version
+  if ApplicationRecord.database.exists?
+    puts " #{ApplicationRecord.database.human_adapter_name}:".ljust(justify) + ApplicationRecord.database.version
 
     Gitlab.ee do
       if Gitlab::Geo.connected? && Gitlab::Geo.enabled?
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 375a23fdfd6..27451001679 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -2,6 +2,5 @@
 
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.use_cookies_with_metadata = true
 Rails.application.config.action_dispatch.cookies_serializer =
   Gitlab::Utils.to_boolean(ENV['USE_UNSAFE_HYBRID_COOKIES']) ? :hybrid : :json
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 7aedf9013ae..1eb9d12812a 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -10,8 +10,6 @@ Gitlab.ee do
   end
 end
 
-ActiveRecord::Base.establish_connection(Gitlab::Database.main.db_config_with_default_pool_size)
-
 Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
     Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
new file mode 100644
index 00000000000..8a2fe1d8388
--- /dev/null
+++ b/config/initializers/database_query_analyzers.rb
@@ -0,0 +1,15 @@
+# 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)
+
+  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
+end
diff --git a/config/initializers/direct_upload_support.rb b/config/initializers/direct_upload_support.rb
index 880aea7d114..f57f0d7980d 100644
--- a/config/initializers/direct_upload_support.rb
+++ b/config/initializers/direct_upload_support.rb
@@ -17,7 +17,7 @@ class DirectUploadsValidator
 
     raise ValidationError, "No provider configured for '#{uploader_type}'. #{supported_provider_text}" if provider.blank?
 
-    return if provider_loaded?(provider)
+    return if provider_supported?(provider)
 
     raise ValidationError, "Object storage provider '#{provider}' is not supported " \
                            "when 'direct_upload' is used for '#{uploader_type}'. #{supported_provider_text}"
@@ -25,12 +25,8 @@ class DirectUploadsValidator
 
   private
 
-  def provider_loaded?(provider)
-    return false unless SUPPORTED_DIRECT_UPLOAD_PROVIDERS.include?(provider)
-
-    require 'fog/azurerm' if provider == ObjectStorage::Config::AZURE_PROVIDER
-
-    true
+  def provider_supported?(provider)
+    SUPPORTED_DIRECT_UPLOAD_PROVIDERS.include?(provider)
   end
 
   def supported_provider_text
diff --git a/config/initializers/elastic_client_setup.rb b/config/initializers/elastic_client_setup.rb
index 5b8d81265ad..67b5032a2ee 100644
--- a/config/initializers/elastic_client_setup.rb
+++ b/config/initializers/elastic_client_setup.rb
@@ -45,6 +45,23 @@ Gitlab.ee do
     end
   end
 
+  ### Modified from elasticsearch-model/lib/elasticsearch/model/searching.rb
+
+  module Elasticsearch
+    module Model
+      module Searching
+        class SearchRequest
+          def execute!
+            response = klass.client.search(@definition)
+            raise Elastic::TimeoutError if response['timed_out']
+
+            response
+          end
+        end
+      end
+    end
+  end
+
   ### Modified from elasticsearch-model/lib/elasticsearch/model.rb
 
   [
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
index ba5c1340b10..e5e17672c4e 100644
--- a/config/initializers/forbid_sidekiq_in_transactions.rb
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -20,7 +20,7 @@ module Sidekiq
       module NoEnqueueingFromTransactions
         %i(perform_async perform_at perform_in).each do |name|
           define_method(name) do |*args|
-            if !Sidekiq::Worker.skip_transaction_check && Gitlab::Database.main.inside_transaction?
+            if !Sidekiq::Worker.skip_transaction_check && ApplicationRecord.inside_transaction?
               begin
                 raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG
                 `#{self}.#{name}` cannot be called inside a transaction as this can lead to
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb
index a31b11bb2be..df75178740b 100644
--- a/config/initializers/load_balancing.rb
+++ b/config/initializers/load_balancing.rb
@@ -20,7 +20,7 @@ Gitlab::Database::LoadBalancing.base_models.each do |model|
   Gitlab::Cluster::LifecycleEvents.on_before_fork do
     # When forking, we don't want to wait until the connections aren't in use
     # any more, as this could delay the boot cycle.
-    model.connection.load_balancer.disconnect!(timeout: 0)
+    model.load_balancer.disconnect!(timeout: 0)
   end
 
   # Service discovery only needs to run in the worker processes, as the main one
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
deleted file mode 100644
index 3d3ee5299e2..00000000000
--- a/config/initializers/new_framework_defaults.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# Remove this `if` condition when upgraded to rails 5.0.
-# The body must be kept.
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.0 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = false
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = false
-
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = false
-
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = false
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index 49f382547d6..5af8cf52656 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -10,10 +10,29 @@ if Gitlab.ee?
     IncidentManagement::PendingEscalations::Alert,
     IncidentManagement::PendingEscalations::Issue
   ])
+else
+  Gitlab::Database::Partitioning.register_tables([
+    {
+      table_name: 'incident_management_pending_alert_escalations',
+      partitioned_column: :process_at, strategy: :monthly
+    },
+    {
+      table_name: 'incident_management_pending_issue_escalations',
+      partitioned_column: :process_at, strategy: :monthly
+    }
+  ])
 end
 
-begin
-  Gitlab::Database::Partitioning.sync_partitions unless ENV['DISABLE_POSTGRES_PARTITION_CREATION_ON_STARTUP']
-rescue ActiveRecord::ActiveRecordError, PG::Error
-  # ignore - happens when Rake tasks yet have to create a database, e.g. for testing
+# The following tables are already defined as models
+unless Gitlab.jh?
+  Gitlab::Database::Partitioning.register_tables([
+    # This should be synchronized with the following model:
+    # https://gitlab.com/gitlab-jh/gitlab/-/blob/main-jh/jh/app/models/phone/verification_code.rb
+    {
+      table_name: 'verification_codes',
+      partitioned_column: :created_at, strategy: :monthly
+    }
+  ])
 end
+
+Gitlab::Database::Partitioning.sync_partitions_ignore_db_error
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 02fc4912f94..75328dcd891 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -19,15 +19,31 @@ cookie_key = if Rails.env.development?
                "_gitlab_session"
              end
 
-sessions_config = Gitlab::Redis::SharedState.params
-sessions_config[:namespace] = Gitlab::Redis::SharedState::SESSION_NAMESPACE
+if Gitlab::Utils.to_boolean(ENV['GITLAB_REDIS_STORE_WITH_SESSION_STORE'], default: true)
+  store = Gitlab::Redis::SharedState.store(
+    namespace: Gitlab::Redis::SharedState::SESSION_NAMESPACE
+  )
 
-Gitlab::Application.config.session_store(
-  :redis_store, # Using the cookie_store would enable session replay attacks.
-  servers: sessions_config,
-  key: cookie_key,
-  secure: Gitlab.config.gitlab.https,
-  httponly: true,
-  expires_in: Settings.gitlab['session_expire_delay'] * 60,
-  path: Rails.application.config.relative_url_root.presence || '/'
-)
+  Gitlab::Application.config.session_store(
+    :redis_store, # Using the cookie_store would enable session replay attacks.
+    redis_store: store,
+    key: cookie_key,
+    secure: Gitlab.config.gitlab.https,
+    httponly: true,
+    expires_in: Settings.gitlab['session_expire_delay'] * 60,
+    path: Rails.application.config.relative_url_root.presence || '/'
+  )
+else
+  sessions_config = Gitlab::Redis::SharedState.params
+  sessions_config[:namespace] = Gitlab::Redis::SharedState::SESSION_NAMESPACE
+
+  Gitlab::Application.config.session_store(
+    :redis_store, # Using the cookie_store would enable session replay attacks.
+    servers: sessions_config,
+    key: cookie_key,
+    secure: Gitlab.config.gitlab.https,
+    httponly: true,
+    expires_in: Settings.gitlab['session_expire_delay'] * 60,
+    path: Rails.application.config.relative_url_root.presence || '/'
+  )
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index d33550b82d1..23052e7ac57 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -114,3 +114,6 @@ Sidekiq.configure_client do |config|
 
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
 end
+
+Sidekiq::Client.prepend Gitlab::Patch::SidekiqClient
+Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqCronPoller
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index 8e69e1634f1..7fa71225aae 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -42,7 +42,7 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d
     def connect(*args)
       val = super
 
-      if current_transaction = ::Gitlab::Metrics::Transaction.current
+      if current_transaction = (::Gitlab::Metrics::WebTransaction.current || ::Gitlab::Metrics::BackgroundTransaction.current)
         current_transaction.increment(:gitlab_transaction_new_redis_connections_total, 1)
       end
 
diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb
index b7e4e143765..876ae5da230 100644
--- a/config/initializers_before_autoloader/000_inflections.rb
+++ b/config/initializers_before_autoloader/000_inflections.rb
@@ -39,4 +39,5 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'EE'
   inflect.acronym 'JH'
   inflect.acronym 'CSP'
+  inflect.acronym 'VSCode'
 end
diff --git a/config/initializers_before_autoloader/100_patch_omniauth_oauth2.rb b/config/initializers_before_autoloader/100_patch_omniauth_oauth2.rb
index 1ede92609a9..c6baae56d3d 100644
--- a/config/initializers_before_autoloader/100_patch_omniauth_oauth2.rb
+++ b/config/initializers_before_autoloader/100_patch_omniauth_oauth2.rb
@@ -10,31 +10,11 @@
 module OmniAuth
   module Strategies
     class OAuth2
+      alias_method :original_callback_phase, :callback_phase
+
       def callback_phase
-        error = request.params["error_reason"].presence || request.params["error"].presence
-        # Monkey patch #1:
-        #
-        # Swap the order of these conditions around so the `state` param is verified *first*,
-        # before using the error params returned by the provider.
-        #
-        # This avoids content spoofing attacks by crafting a URL with malicious messages,
-        # because the `state` param is only present in the session after a valid OAuth2 authentication flow.
-        if !options.provider_ignores_state && (request.params["state"].to_s.empty? || request.params["state"] != session.delete("omniauth.state"))
-          fail!(:csrf_detected, CallbackError.new(:csrf_detected, "CSRF detected"))
-        elsif error
-          fail!(error, CallbackError.new(request.params["error"], request.params["error_description"].presence || request.params["error_reason"].presence, request.params["error_uri"]))
-        else
-          self.access_token = build_access_token
-          self.access_token = access_token.refresh! if access_token.expired?
-          super
-        end
-      rescue ::OAuth2::Error, CallbackError => e
-        fail!(:invalid_credentials, e)
-      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
-        fail!(:timeout, e)
-      rescue ::SocketError => e
-        fail!(:failed_to_connect, e)
-      # Monkey patch #2:
+        original_callback_phase
+      # Monkey patch #1:
       #
       # Also catch errors from Faraday.
       # See https://github.com/omniauth/omniauth-oauth2/pull/129
diff --git a/config/known_invalid_graphql_queries.yml b/config/known_invalid_graphql_queries.yml
index 3dc4b10a6a8..84c6039793d 100644
--- a/config/known_invalid_graphql_queries.yml
+++ b/config/known_invalid_graphql_queries.yml
@@ -1,5 +1,3 @@
 ---
 filenames:
-  - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/update_oncall_schedule_rotation.mutation.graphql
-  - ee/app/assets/javascripts/security_configuration/api_fuzzing/graphql/api_fuzzing_ci_configuration.query.graphql
-  - ee/app/assets/javascripts/security_configuration/api_fuzzing/graphql/create_api_fuzzing_configuration.mutation.graphql
+  - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/update_oncall_schedule_rotation.mutation.graphql
+\ No newline at end of file
diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
index 54ebe5da192..04a0b5e34e9 100644
--- a/config/metrics/aggregates/code_review.yml
+++ b/config/metrics/aggregates/code_review.yml
@@ -67,6 +67,12 @@
     - 'i_code_review_user_resolve_conflict'
     - 'i_code_review_user_searches_diff'
     - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
 - name: code_review_category_monthly_active_users
   operator: OR
   source: redis
@@ -126,6 +132,12 @@
     - 'i_code_review_user_resolve_conflict'
     - 'i_code_review_user_searches_diff'
     - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   source: redis
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index 924a19cae74..8ea92369e0b 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -11,7 +11,7 @@ status: removed
 milestone_removed: '13.11'
 milestone: '13.7'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49886
-time_frame: 7d
+time_frame: 28d
 data_source: redis_hll
 distribution:
   - ce
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index efa4cca301f..c33cc1809af 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -8,7 +8,7 @@ product_group: group::import
 product_category: importers
 value_type: number
 status: active
-time_frame: all
+time_frame: 28d
 data_source: database
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 5731b6b3cae..557a38cad1c 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -8,7 +8,7 @@ product_group: group::import
 product_category: importers
 value_type: number
 status: active
-time_frame: all
+time_frame: 28d
 data_source: database
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index be4e45b8975..d9f255a0b2d 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -8,7 +8,7 @@ product_group: group::import
 product_category: importers
 value_type: number
 status: active
-time_frame: all
+time_frame: 28d
 data_source: database
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index 72617203f6a..495c7740e3f 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who toggled a task item in a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index f3c4a921afa..87d78d83450 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who approve a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index ab4d4c1bfc7..94ac6d7b6b7 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who unapprove a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index 9f2ab332a08..5cd9131d663 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who resolve a thread in a merge req
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index 83644eff397..01ab33527cc 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who unresolve a thread in a merge r
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index df7acea15f8..e09ac66953f 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who edit the title of a merge reque
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index 02980ed84f8..99bddd4591b 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who edit the description of a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index cb0ba9c4785..9626907c904 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who create a note as part of a merg
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 78228a1da48..1153c89126e 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who publish their review as part of
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 4a4853a7520..805914598d6 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who create a multiline comment in a
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index 36b2de72379..84fa938126f 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who edit a multiline comment in a me
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index 7cc2b9b2cc2..db2155a71fe 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who remove a multiline comment in a
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 7e8db2be0b7..da36f141a43 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who are assigned to a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index f755351eb1e..4afb00c81dd 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who mark a merge request as a draft
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index a5685f7634a..c104c010002 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who unmark a merge request as a dra
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index 9e6f61a755b..d65c8380bc9 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who request a review of a merge req
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index 35562e095c8..0da9ce57fea 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who add an approval rule to a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 023f241596e..d2be31f7e89 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who delete an approval rule to a me
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index eae629b21f3..2c1fc6664ff 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per month who delete an approval rule to a me
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index f833466e32c..fec6640220f 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who use GitLab Workflow for VS Code
 product_stage: create
 product_group: group::code review
 product_category: editor_extension
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index 25a1a2948db..27c161cf13c 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who create a merge request from an
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index c4c390d16e6..f41722f99cc 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per month who interact with a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 66b8e714723..c80a7dada11 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -159,6 +159,7 @@ options:
   - p_ci_templates_implicit_security_api_fuzzing
   - p_ci_templates_implicit_security_dast
   - p_ci_templates_implicit_security_cluster_image_scanning
+  - p_ci_templates_kaniko
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index 84da476edb5..a09e973206d 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -8,8 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: broken
-repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
+status: active
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index f028719bfe1..93f551178c3 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -8,8 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: broken
-repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
+status: active
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index 8ce25e2d976..29ec7855453 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -7,6 +7,7 @@ product_section:
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index b287346496b..dceee0cc3ff 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -7,6 +7,7 @@ product_section:
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
index 4fa6d3d8843..a923fd255b7 100644
--- a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
@@ -9,7 +9,7 @@ value_type: number
 status: active
 milestone: "14.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157
-time_frame: 7d
+time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
index 9d19a6ffa72..28ed156f483 100644
--- a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
@@ -9,7 +9,7 @@ value_type: number
 status: active
 milestone: "14.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157
-time_frame: 7d
+time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
index 5b7b7924c4a..13f3bb050db 100644
--- a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
@@ -9,7 +9,7 @@ value_type: number
 status: active
 milestone: "14.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157
-time_frame: 7d
+time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
new file mode 100644
index 00000000000..1278c880072
--- /dev/null
+++ b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_monthly
+description: ''
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
+value_type: number
+status: active
+milestone: '14.3'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72400
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_ci_templates_kaniko
diff --git a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
new file mode 100644
index 00000000000..76f24633869
--- /dev/null
+++ b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_monthly
+description: Count of MAU using the `/promote_to_incident` quick action
+product_section: ops
+product_stage: monitor
+product_group: group::monitor
+product_category: incident_management
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73992
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_promote_to_incident
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
new file mode 100644
index 00000000000..c9589f3ff29
--- /dev/null
+++ b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_latest_monthly
+description: Count of pipelines using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_sast_iac_latest
diff --git a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
new file mode 100644
index 00000000000..9e5724b1e40
--- /dev/null
+++ b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_latest_monthly
+description: Count of pipelines with implicit runs using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_sast_iac_latest
diff --git a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
new file mode 100644
index 00000000000..40aa9cdbab1
--- /dev/null
+++ b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_monthly
+description: Count of pipelines using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_jobs_sast_iac_latest
diff --git a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
new file mode 100644
index 00000000000..3fa3c751366
--- /dev/null
+++ b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_latest_monthly
+description: Count of pipelines with implicit runs using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_sast_iac_latest
diff --git a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
new file mode 100644
index 00000000000..1aa0edf60e6
--- /dev/null
+++ b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_widget_nothing_merge_click_new_file_monthly
+description: Count of users who click the create file button in the nothing to merge widget state
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_widget_nothing_merge_click_new_file
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
new file mode 100644
index 00000000000..8bdad9d6837
--- /dev/null
+++ b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_delete_branch_monthly
+description: Count of users who click the delete source branch button after merge
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_delete_branch
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
new file mode 100644
index 00000000000..aac7e359887
--- /dev/null
+++ b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_revert_monthly
+description: Count of users who click the revert button in the merge requet widget
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_click_revert
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
new file mode 100644
index 00000000000..cb0eb0e9b34
--- /dev/null
+++ b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_cherry_pick_monthly
+description: Count of users who click the cherry pick button in the merge requet widget
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_click_cherry_pick
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
new file mode 100644
index 00000000000..8e20f87ee29
--- /dev/null
+++ b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_revert_modal_monthly
+description: Count of users who submit the post merge revert modal
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_submit_revert_modal
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
new file mode 100644
index 00000000000..e1492156507
--- /dev/null
+++ b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_cherry_pick_modal_monthly
+description: Count of users who submit the post merge revert modal
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_submit_cherry_pick_modal
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 2a1a174f5a5..36097c13951 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -5,6 +5,7 @@ description: Count of WAU editing an issue title
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
+product_section: 'TBD'
 value_type: number
 status: active
 milestone: "13.6"
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 13094d1f7fd..d74794c08c7 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -8,7 +8,7 @@ product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: active
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index 892bafaadd6..78d489712bb 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who toggled a task item in a merge r
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 6f4de7ac49e..50a616d3156 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who approve a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index 756bbea7657..341178587c9 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who unapprove a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index 7cff71aa29c..bb80932f86b 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who resolve a thread in a merge requ
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 20171f95fd3..1d91fa77e0c 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who unresolve a thread in a merge re
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index 5e56eaaa837..bb2ebfc942b 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who edit the title of a merge reques
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index 3c7a7f7d82a..64de1c4ef82 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who edit the description of a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 6b91ab4102f..731c07d4fad 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who create a note as part of a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index 20c4c9cef5e..d036350ef9d 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who publish their review as part of
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 26300d52dce..b90e46a5cd8 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who create a multiline comment in a
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index 2cbae1dff37..5efcda783ff 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who edit a multiline comment in a me
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index 1d80969f63a..71f051f10ee 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who remove a multiline comment in a
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 741f8ff83fc..2bef437e3d0 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who are assigned to a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index 960a9b18987..28bfd16ef6f 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -4,6 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_week
 description: Count of unique users per week who mark a merge request as a draft
 product_stage: create
 product_group: group::code review
+product_section: 'TBD'
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index 76a7a4a97ab..4c2944cf0c1 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who unmark a merge request as a draf
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index 70b88e97e20..57381e15a19 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who request a review of a merge requ
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 038f53b62a9..b38faa983c7 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who add an approval rule to a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index 8a7b2c31194..02fe4cc5993 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -6,6 +6,7 @@ description: Count of unique users per week who delete an approval rule to a mer
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index b5831569160..58b569521bb 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who edit an approval rule to a merge
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index cab4aa62b43..3e3668df67d 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who use GitLab Workflow for VS Code
 product_stage: create
 product_group: group::code review
 product_category: editor_extension
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 53a18b79605..7cf0936e79f 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who create a merge request from an i
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 24f82a6a442..eb62bf37a70 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -5,6 +5,7 @@ description: Count of unique users per week who interact with a merge request
 product_stage: create
 product_group: group::code review
 product_category: code_review
+product_section: 'TBD'
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index cf0e69c6da2..31813735ea4 100644
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -159,6 +159,7 @@ options:
   - p_ci_templates_implicit_security_api_fuzzing
   - p_ci_templates_implicit_security_dast
   - p_ci_templates_implicit_security_cluster_image_scanning
+  - p_ci_templates_kaniko
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index 63278bcfbd8..d529d1c2f38 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -8,8 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: broken
-repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
+status: active
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index 1402f3fd574..a8449bad161 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_weekly
 name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
-product_section:
+product_section: 'TBD'
 product_stage: create
 product_group: group::code review
 product_category: code_review
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index a60f6a23a76..b25ed55bae1 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -3,14 +3,14 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_weekly
 name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
-product_section:
+product_section: 'TBD'
 product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
 status: active
 milestone: "13.12"
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
diff --git a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
new file mode 100644
index 00000000000..f101eefc933
--- /dev/null
+++ b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_weekly
+description: ''
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72400
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+options:
+  events:
+    - p_ci_templates_kaniko
diff --git a/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
new file mode 100644
index 00000000000..a3ca5d70089
--- /dev/null
+++ b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_weekly
+description: Count of WAU using the `/severity` quick action
+product_section: ops
+product_stage: monitor
+product_group: group::monitor
+product_category: incident_management
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73992
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_promote_to_incident
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
new file mode 100644
index 00000000000..e7e2c096902
--- /dev/null
+++ b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
@@ -0,0 +1,27 @@
+---
+data_category: optional
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_latest_weekly
+description: Count of pipelines using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_sast_iac_latest
diff --git a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
new file mode 100644
index 00000000000..09070adb2c1
--- /dev/null
+++ b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_latest_weekly
+description: Count of pipelines with implicit runs using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_sast_iac_latest
diff --git a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
new file mode 100644
index 00000000000..3fdd37bffa5
--- /dev/null
+++ b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_weekly
+description: Count of pipelines using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_jobs_sast_iac_latest
diff --git a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
new file mode 100644
index 00000000000..3a58cd033f2
--- /dev/null
+++ b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_latest_weekly
+description: Count of pipelines with implicit runs using the latest SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_sast_iac_latest
diff --git a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
new file mode 100644
index 00000000000..9f8ae151a80
--- /dev/null
+++ b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_widget_nothing_merge_click_new_file_weekly
+description: Count of users who click the create file button in the nothing to merge widget state
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_widget_nothing_merge_click_new_file
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
new file mode 100644
index 00000000000..f6cd1f6a86b
--- /dev/null
+++ b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_delete_branch_weekly
+description: Count of users who click the delete source branch button after merge
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_delete_branch
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
new file mode 100644
index 00000000000..70f968fcc0e
--- /dev/null
+++ b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_revert_weekly
+description: Count of users who click the revert button in the merge requet widget
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_click_revert
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
new file mode 100644
index 00000000000..90428f31a7a
--- /dev/null
+++ b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_cherry_pick_weekly
+description: Count of users who click the cherry pick button in the merge requet widget
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_click_cherry_pick
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
new file mode 100644
index 00000000000..ea7238e9913
--- /dev/null
+++ b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_revert_modal_weekly
+description: Count of users who submit the post merge revert modal
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_submit_revert_modal
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
new file mode 100644
index 00000000000..ac8649eef80
--- /dev/null
+++ b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_cherry_pick_modal_weekly
+description: Count of users who submit the post merge revert modal
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: active
+milestone: '14.5'
+introduced_by_url:
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_post_merge_submit_cherry_pick_modal
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index c15990a9309..af9338f028a 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -8,7 +8,7 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: removed
-time_frame: 7d
+time_frame: all
 data_source: redis_hll
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
new file mode 100644
index 00000000000..f126415a78f
--- /dev/null
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.kubernetes_agents
+description: Count of Kubernetes registered agents
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: kubernetes_management
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
new file mode 100644
index 00000000000..6cbdb1679a5
--- /dev/null
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.kubernetes_agents_with_token
+description: Count of Kubernetes agents with at least one token
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: kubernetes_management
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 1dfeadbbdfe..dce6352d266 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -7,7 +7,8 @@ product_stage: manage
 product_group: group::manage
 product_category:
 value_type: number
-status: active
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344100
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
new file mode 100644
index 00000000000..e558763e2a0
--- /dev/null
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -0,0 +1,22 @@
+---
+data_category: optional
+key_path: counts.kubernetes_agent_k8s_api_proxy_request
+description: Count of Kubernetes API proxy requests
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: kubernetes_management
+value_type: number
+status: active
+milestone: '13.12'
+introduced_by_url: 
+time_frame: all
+data_source: redis
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index 1f505694535..c201b4c79ee 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_0_sent
 name: "count_sent_first_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index fb2bd8f59e0..cb5f3185eb0 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 13587d77e9a..2b849be1c32 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_1_sent
 name: "count_sent_second_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index e5635ba3d92..ab50a629468 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index 10fb21997d3..72a1d56cab2 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_2_sent
 name: "count_sent_third_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 21841bfe7ba..17dcf4286ac 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_create_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index 66d894a62a9..c504783a652 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_sent
 name: "count_sent_first_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 39d02b343e5..cb316eb3164 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index dcd61e22ab3..e4d1e90bb22 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_sent
 name: "count_sent_second_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index 359eb181926..2b08899e228 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index b0263ce11ed..33c77609b6f 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_sent
 name: "count_sent_third_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index ba0e6ad9753..0cd780b53ed 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index 843b1de808f..70c1e3d1250 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_sent
 name: "count_sent_first_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 82832d991ee..258273438e3 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the verify trial's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index 2393643bacc..f32440ca1ae 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_sent
 name: "count_sent_second_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index cb72d9bb8f5..67543b98020 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the trial track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index b1ae09410d1..185d5bb3aee 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_sent
 name: "count_sent_third_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index a5714e17223..f3a54e2ae31 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the trial track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index beb6c6b9ecc..07b61f70b2e 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_0_sent
 name: "count_sent_first_email_of_the_trial_team_for_in_product_marketing_emails"
 description: Total sent emails of the team track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index 331639ca54f..27d47aff9c3 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index afa2854b0f9..daba149d6c5 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_1_sent
 name: "count_sent_second_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total sent emails of the team track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 0bac5ef76b7..3d5150f6042 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's second email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index fe0770d900b..aaaecb85e74 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_2_sent
 name: "count_sent_third_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total sent emails of the team track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index 3fe16910ae5..0618ca56e89 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_team_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's third email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index 17c5b1a48c4..d4b2f57f3a4 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.in_product_marketing_email_experience_0_sent
 name: "count_sent_first_email_of_the_experience_track_for_in_product_marketing_emails"
 description: Total sent emails of the experience track's first email
-product_section:
+product_section: 'TBD'
 product_stage: growth
 product_group: group::activation
 product_category: onboarding
diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index 5d853604580..0be5497e561 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
@@ -10,7 +10,7 @@ value_type: number
 status: active
 milestone: "14.4"
 introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71287'
-time_frame: 28d
+time_frame: all
 data_source: database
 instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric'
 data_category: Optional
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
new file mode 100644
index 00000000000..8a9c3f969a0
--- /dev/null
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_zentao_active
+name: count_all_projects_zentao_active
+description: Count of projects with active Zentao integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
+time_frame: all
+data_source: database
+data_category: Operational
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
new file mode 100644
index 00000000000..c8a1dfbbdd2
--- /dev/null
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_zentao_active
+name: count_all_groups_zentao_active
+description: Count of groups with active Zentao integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
+time_frame: all
+data_source: database
+data_category: Operational
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
new file mode 100644
index 00000000000..b1c2a9d8b13
--- /dev/null
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.instances_zentao_active
+name: count_all_instances_zentao_active
+description: Count of instances with active Zentao integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
+time_frame: all
+data_source: database
+data_category: Operational
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
new file mode 100644
index 00000000000..34c48ada0ee
--- /dev/null
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_inheriting_zentao_active
+name: count_all_projects_inheriting_zentao_active
+description: Count of projects that inherit active Zentao integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
+time_frame: all
+data_source: database
+data_category: Operational
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
new file mode 100644
index 00000000000..4d374db026e
--- /dev/null
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_inheriting_zentao_active
+name: count_all_groups_inheriting_zentao_active
+description: Count of groups that inherit active Zentao integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
+time_frame: all
+data_source: database
+data_category: Operational
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
new file mode 100644
index 00000000000..b6b11407c6a
--- /dev/null
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_shimo_active
+name: count_all_projects_shimo_active
+description: Count of projects with active Shimo integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
new file mode 100644
index 00000000000..3f2423f7696
--- /dev/null
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_shimo_active
+name: count_all_groups_shimo_active
+description: Count of groups with active Shimo integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
new file mode 100644
index 00000000000..2b835ef6d6c
--- /dev/null
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.instances_shimo_active
+name: count_all_instances_shimo_active
+description: Count of instances with active Shimo integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
new file mode 100644
index 00000000000..d7d231206d5
--- /dev/null
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_inheriting_shimo_active
+name: count_all_projects_inheriting_shimo_active
+description: Count of projects that inherit active Shimo integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
new file mode 100644
index 00000000000..d979e672f60
--- /dev/null
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_inheriting_shimo_active
+name: count_all_groups_inheriting_shimo_active
+description: Count of groups that inherit active Shimo integrations
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "14.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index ede7b9d3f6c..d416c7b6d6e 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["key_path", "description", "value_type", "status", "product_group", "product_stage", "time_frame", "data_source", "distribution", "tier", "data_category", "milestone"],
+  "required": ["key_path", "description", "value_type", "status", "product_group", "product_section", "product_stage", "time_frame", "data_source", "distribution", "tier", "data_category", "milestone"],
   "properties": {
     "key_path": {
       "type": "string"
@@ -13,10 +13,10 @@
       "type": "string"
     },
     "product_section": {
-      "type": ["string", "null"]
+      "type": ["string"]
     },
     "product_stage": {
-      "type": ["string", "null"]
+      "type": ["string"]
     },
     "product_group": {
       "type": "string"
diff --git a/config/plugins/graphql_known_operations_plugin.js b/config/plugins/graphql_known_operations_plugin.js
new file mode 100644
index 00000000000..164b34c1dd1
--- /dev/null
+++ b/config/plugins/graphql_known_operations_plugin.js
@@ -0,0 +1,112 @@
+/* eslint-disable no-underscore-dangle */
+const yaml = require('js-yaml');
+
+const PLUGIN_NAME = 'GraphqlKnownOperationsPlugin';
+const GRAPHQL_PATH_REGEX = /(query|mutation)\.graphql$/;
+const OPERATION_NAME_SOURCE_REGEX = /^\s*module\.exports.*oneQuery.*"(\w+)"/gm;
+
+/**
+ * Returns whether a given webpack module is a "graphql" module
+ */
+const isGraphqlModule = (module) => {
+  return GRAPHQL_PATH_REGEX.test(module.resource);
+};
+
+/**
+ * Returns graphql operation names we can parse from the given module
+ *
+ * Since webpack gives us the source **after** the graphql-tag/loader runs,
+ * we can look for specific lines we're guaranteed to have from the
+ * graphql-tag/loader.
+ */
+const getOperationNames = (module) => {
+  const originalSource = module.originalSource();
+
+  if (!originalSource) {
+    return [];
+  }
+
+  const matches = originalSource.source().toString().matchAll(OPERATION_NAME_SOURCE_REGEX);
+
+  return Array.from(matches).map((match) => match[1]);
+};
+
+const createFileContents = (knownOperations) => {
+  const sourceData = Array.from(knownOperations.values()).sort((a, b) => a.localeCompare(b));
+
+  return yaml.dump(sourceData);
+};
+
+/**
+ * Creates a webpack4 compatible "RawSource"
+ *
+ * Inspired from https://sourcegraph.com/github.com/FormidableLabs/webpack-stats-plugin@e050ff8c362d5ddd45c66ade724d4a397ace3e5c/-/blob/lib/stats-writer-plugin.js?L144
+ */
+const createWebpackRawSource = (source) => {
+  const buff = Buffer.from(source, 'utf-8');
+
+  return {
+    source() {
+      return buff;
+    },
+    size() {
+      return buff.length;
+    },
+  };
+};
+
+const onSucceedModule = ({ module, knownOperations }) => {
+  if (!isGraphqlModule(module)) {
+    return;
+  }
+
+  getOperationNames(module).forEach((x) => knownOperations.add(x));
+};
+
+const onCompilerEmit = ({ compilation, knownOperations, filename }) => {
+  const contents = createFileContents(knownOperations);
+  const source = createWebpackRawSource(contents);
+
+  const asset = compilation.getAsset(filename);
+  if (asset) {
+    compilation.updateAsset(filename, source);
+  } else {
+    compilation.emitAsset(filename, source);
+  }
+};
+
+/**
+ * Webpack plugin that outputs a file containing known graphql operations.
+ *
+ * A lot of the mechanices was expired from [this example][1].
+ *
+ * [1]: https://sourcegraph.com/github.com/FormidableLabs/webpack-stats-plugin@e050ff8c362d5ddd45c66ade724d4a397ace3e5c/-/blob/lib/stats-writer-plugin.js?L136
+ */
+class GraphqlKnownOperationsPlugin {
+  constructor({ filename }) {
+    this._filename = filename;
+  }
+
+  apply(compiler) {
+    const knownOperations = new Set();
+
+    compiler.hooks.emit.tap(PLUGIN_NAME, (compilation) => {
+      onCompilerEmit({
+        compilation,
+        knownOperations,
+        filename: this._filename,
+      });
+    });
+
+    compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.succeedModule.tap(PLUGIN_NAME, (module) => {
+        onSucceedModule({
+          module,
+          knownOperations,
+        });
+      });
+    });
+  }
+}
+
+module.exports = GraphqlKnownOperationsPlugin;
diff --git a/config/routes.rb b/config/routes.rb
index 01e57a01359..94d36961b32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,12 +43,15 @@ Rails.application.routes.draw do
 
   draw :oauth
 
-  use_doorkeeper_openid_connect
+  use_doorkeeper_openid_connect do
+    controllers discovery: 'jwks'
+  end
+
   # Add OPTIONS method for CORS preflight requests
   match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options
-  match '/oauth/discovery/keys' => 'doorkeeper/openid_connect/discovery#keys', via: :options
-  match '/.well-known/openid-configuration' => 'doorkeeper/openid_connect/discovery#provider', via: :options
-  match '/.well-known/webfinger' => 'doorkeeper/openid_connect/discovery#webfinger', via: :options
+  match '/oauth/discovery/keys' => 'jwks#keys', via: :options
+  match '/.well-known/openid-configuration' => 'jwks#provider', via: :options
+  match '/.well-known/webfinger' => 'jwks#webfinger', via: :options
 
   match '/oauth/token' => 'oauth/tokens#create', via: :options
   match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options
diff --git a/config/routes/explore.rb b/config/routes/explore.rb
index c6bf98b6fb3..6ddf4d23138 100644
--- a/config/routes/explore.rb
+++ b/config/routes/explore.rb
@@ -5,6 +5,8 @@ namespace :explore do
     collection do
       get :trending
       get :starred
+      get :topics
+      get 'topics/:topic_name', action: :topic, as: :topic, constraints: { topic_name: /.+/ }
     end
   end
 
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 803249f8861..9a50d580747 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -125,6 +125,13 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         get 'milestones'
       end
     end
+
+    resources :crm, only: [] do
+      collection do
+        get 'contacts'
+        get 'organizations'
+      end
+    end
   end
 
   scope(path: '*id',
@@ -148,5 +155,7 @@ scope format: false do
     get 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha' => 'groups/dependency_proxy_for_containers#blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
     post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload/authorize' => 'groups/dependency_proxy_for_containers#authorize_upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
     post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload' => 'groups/dependency_proxy_for_containers#upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
+    post 'v2/*group_id/dependency_proxy/containers/*image/manifests/*tag/upload/authorize' => 'groups/dependency_proxy_for_containers#authorize_upload_manifest' # rubocop:todo Cop/PutGroupRoutesUnderScope
+    post 'v2/*group_id/dependency_proxy/containers/*image/manifests/*tag/upload' => 'groups/dependency_proxy_for_containers#upload_manifest' # rubocop:todo Cop/PutGroupRoutesUnderScope
   end
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index b1be9ad2ada..7f9b2cc4fbf 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -38,7 +38,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
 
         namespace :security do
-          resource :configuration, only: [:show], controller: :configuration
+          resource :configuration, only: [:show], controller: :configuration do
+            resource :sast, only: [:show], controller: :sast_configuration
+          end
         end
 
         resources :artifacts, only: [:index, :destroy]
@@ -358,7 +360,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get 'details', on: :member
         end
 
-        resources :work_items, only: [:index]
+        get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert'
+
+        get 'work_items/*work_items_path' => 'work_items#index', as: :work_items
 
         resource :tracing, only: [:show]
 
@@ -536,6 +540,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           delete :delete_attachment # rubocop:todo Cop/PutProjectRoutesUnderScope
           post :resolve # rubocop:todo Cop/PutProjectRoutesUnderScope
           delete :resolve, action: :unresolve # rubocop:todo Cop/PutProjectRoutesUnderScope
+          get :outdated_line_change # rubocop:todo Cop/PutProjectRoutesUnderScope
         end
       end
 
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 56183d167be..f7e3f036c53 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -35,10 +35,14 @@
   - 1
 - - analytics_usage_trends_counter_job
   - 1
+- - app_sec_dast_scans_consistency
+  - 1
 - - approval_rules_external_approval_rule_payload
   - 1
 - - approve_blocked_pending_approval_users
   - 1
+- - audit_events_audit_event_streaming
+  - 1
 - - authorized_keys
   - 2
 - - authorized_project_update
@@ -175,6 +179,8 @@
   - 1
 - - group_wikis_git_garbage_collect
   - 1
+- - groups_create_event
+  - 1
 - - groups_export_memberships
   - 1
 - - groups_schedule_bulk_repository_shard_moves
@@ -197,6 +203,8 @@
   - 1
 - - incident_management_pending_escalations_alert_create
   - 1
+- - integrations_create_external_cross_reference
+  - 1
 - - invalid_gpg_signature_update
   - 2
 - - irker
@@ -211,6 +219,10 @@
   - 2
 - - issue_rebalancing
   - 1
+- - issues_placement
+  - 2
+- - issues_rebalancing
+  - 1
 - - iterations
   - 1
 - - jira_connect
@@ -247,6 +259,8 @@
   - 1
 - - namespaceless_project_destroy
   - 1
+- - namespaces_invite_team_email
+  - 1
 - - namespaces_onboarding_issue_created
   - 1
 - - namespaces_onboarding_pipeline_created
@@ -391,6 +405,8 @@
   - 1
 - - system_hook_push
   - 1
+- - tasks_to_be_done_create
+  - 1
 - - todos_destroyer
   - 1
 - - unassign_issuables
diff --git a/config/webpack.config.js b/config/webpack.config.js
index e1a48ee2b41..f334e17bbaf 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -24,6 +24,7 @@ const IS_JH = require('./helpers/is_jh_env');
 const vendorDllHash = require('./helpers/vendor_dll_hash');
 
 const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
+const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin');
 
 const ROOT_PATH = path.resolve(__dirname, '..');
 const SUPPORTED_BROWSERS = fs.readFileSync(path.join(ROOT_PATH, '.browserslistrc'), 'utf-8');
@@ -198,6 +199,7 @@ if (!IS_PRODUCTION) {
 
   Object.assign(alias, {
     test_fixtures: path.join(ROOT_PATH, `tmp/tests/frontend/${fixtureDir}`),
+    test_fixtures_static: path.join(ROOT_PATH, 'spec/frontend/fixtures/static'),
     test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'),
   });
 }
@@ -455,6 +457,8 @@ module.exports = {
       globalAPI: true,
     }),
 
+    new GraphqlKnownOperationsPlugin({ filename: 'graphql_known_operations.yml' }),
+
     // fix legacy jQuery plugins which depend on globals
     new webpack.ProvidePlugin({
       $: 'jquery',
author	GitLab Bot <gitlab-bot@gitlab.com>	2021-11-18 13:16:36 +0000
committer	GitLab Bot <gitlab-bot@gitlab.com>	2021-11-18 13:16:36 +0000
commit	311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch)
tree	07e7870bca8aed6d61fdcc810731c50d2c40af47 /config
parent	27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff)
download	gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz