Add latest changes from gitlab-org/gitlab@master

9 files changed, 89 insertions, 0 deletions

diff --git a/config/feature_flags/ops/enforce_locked_labels_on_merge.yml b/config/feature_flags/ops/enforce_locked_labels_on_merge.yml
new file mode 100644
index 00000000000..5dd02e8e46e
--- /dev/null
+++ b/config/feature_flags/ops/enforce_locked_labels_on_merge.yml
@@ -0,0 +1,8 @@
+---
+name: enforce_locked_labels_on_merge
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128928
+rollout_issue_url:
+milestone: '16.3'
+type: ops
+group: group::project management
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index 8d1f00446d7..18f4ed24837 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -141,3 +141,4 @@ options:
     - 'i_code_review_merge_request_widget_security_reports_expand_failed'
     - 'i_code_review_saved_replies_create'
     - 'i_code_review_saved_replies_use'
+    - 'i_code_review_saved_replies_use_in_mr'
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index e19e0965e05..796acd20d15 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -146,3 +146,4 @@ options:
     - 'i_code_review_merge_request_widget_security_reports_expand_failed'
     - 'i_code_review_saved_replies_create'
     - 'i_code_review_saved_replies_use'
+    - 'i_code_review_saved_replies_use_in_mr'
diff --git a/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
new file mode 100644
index 00000000000..490dbfadcd2
--- /dev/null
+++ b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_saved_replies_use_in_mr_monthly
+description: Monthly unique users who used saved replies from an MR page
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: "16.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
+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:
+  - i_code_review_saved_replies_use_in_mr
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index 94cf3bcc63c..b7a65d38ab3 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -144,3 +144,4 @@ options:
     - 'i_code_review_merge_request_widget_security_reports_expand_failed'
     - 'i_code_review_saved_replies_create'
     - 'i_code_review_saved_replies_use'
+    - 'i_code_review_saved_replies_use_in_mr'
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index a15273b156b..c7c7e248ea0 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -139,3 +139,4 @@ options:
     - 'i_code_review_merge_request_widget_security_reports_expand_failed'
     - 'i_code_review_saved_replies_create'
     - 'i_code_review_saved_replies_use'
+    - 'i_code_review_saved_replies_use_in_mr'
diff --git a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
new file mode 100644
index 00000000000..81dc130397b
--- /dev/null
+++ b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_saved_replies_use_in_mr_weekly
+description: Weekly unique users who used saved replies from an MR page
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: "16.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
+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:
+  - i_code_review_saved_replies_use_in_mr
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
new file mode 100644
index 00000000000..a12d694306e
--- /dev/null
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -0,0 +1,25 @@
+---
+key_path: counts.i_code_review_saved_replies_use_in_mr
+description: Total number of times a saved reply was used from an MR page
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: "16.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: RedisMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  event: use_in_mr
+  prefix: i_code_review_saved_replies
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index bfe9b80b241..260cdeb27d6 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -445,6 +445,8 @@
   - 1
 - - package_cleanup
   - 1
+- - package_metadata_advisory_scan
+  - 1
 - - package_repositories
   - 1
 - - packages_composer_cache_update