Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 25 deletions

diff --git a/danger/analytics_instrumentation/Dangerfile b/danger/analytics_instrumentation/Dangerfile
new file mode 100644
index 00000000000..bbb984939dc
--- /dev/null
+++ b/danger/analytics_instrumentation/Dangerfile
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+return if stable_branch.valid_stable_branch?
+
+analytics_instrumentation.check!
+
+analytics_instrumentation.check_affected_scopes!
+
+analytics_instrumentation.check_usage_data_insertions!
diff --git a/danger/plugins/analytics_instrumentation.rb b/danger/plugins/analytics_instrumentation.rb
new file mode 100644
index 00000000000..2343a56f09d
--- /dev/null
+++ b/danger/plugins/analytics_instrumentation.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative '../../tooling/danger/analytics_instrumentation'
+
+module Danger
+  class AnalyticsInstrumentation < ::Danger::Plugin
+    # Put the helper code somewhere it can be tested
+    include Tooling::Danger::AnalyticsInstrumentation
+  end
+end
diff --git a/danger/plugins/product_intelligence.rb b/danger/plugins/product_intelligence.rb
deleted file mode 100644
index 91551a8312f..00000000000
--- a/danger/plugins/product_intelligence.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../tooling/danger/product_intelligence'
-
-module Danger
-  class ProductIntelligence < ::Danger::Plugin
-    # Put the helper code somewhere it can be tested
-    include Tooling::Danger::ProductIntelligence
-  end
-end
diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile
deleted file mode 100644
index b20c56a7b7c..00000000000
--- a/danger/product_intelligence/Dangerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-return if stable_branch.valid_stable_branch?
-
-product_intelligence.check!
-
-product_intelligence.check_affected_scopes!
-
-product_intelligence.check_usage_data_insertions!
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
index 17005d853bb..5b865498651 100644
--- a/danger/roulette/Dangerfile
+++ b/danger/roulette/Dangerfile
@@ -55,7 +55,7 @@ end
 OPTIONAL_REVIEW_TEMPLATE = '%{role} review is optional for %{category}'
 NOT_AVAILABLE_TEMPLATES = {
   default: 'No %{role} available',
-  product_intelligence: group_not_available_template('#g_product_intelligence', '@gitlab-org/analytics-section/product-intelligence/engineers'),
+  product_intelligence: group_not_available_template('#g_analyze_analytics_instrumentation', '@gitlab-org/analytics-section/product-intelligence/engineers'),
   import_integrate_be: group_not_available_template('#g_manage_import_and_integrate', '@gitlab-org/manage/import-and-integrate'),
   import_integrate_fe: group_not_available_template('#g_manage_import_and_integrate', '@gitlab-org/manage/import-and-integrate')
 }.freeze
@@ -98,14 +98,14 @@ categories << :database if helper.mr_labels.include?('database')
 # Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI) except when it's from wider community contribution where we want to assign from the corresponding group
 categories << :ux if helper.mr_labels.include?('UX') && !helper.mr_labels.include?('Community contribution') # rubocop:disable Rails/NegateInclude
 
-# Ensure to spin for Product Intelligence reviewer when ~"product intelligence::review pending" is applied
-categories << :product_intelligence if helper.mr_labels.include?("product intelligence::review pending")
+# Ensure to spin for Analytics Instrumentation reviewer when ~"analytics instrumentation::review pending" is applied
+categories << :analytics_instrumentation if helper.mr_labels.include?("analytics instrumentation::review pending")
 
-# Skip Product intelligence reviews for growth experiment MRs
-categories.delete(:product_intelligence) if helper.mr_labels.include?("growth experiment")
+# Skip Analytics Instrumentation reviews for growth experiment MRs
+categories.delete(:analytics_instrumentation) if helper.mr_labels.include?("growth experiment")
 
 # Skip specialty reviews for stable branch MRs since they have already been merged to the default branch
-categories.subtract([:database, :ux, :product_intelligence]) if stable_branch.valid_stable_branch?
+categories.subtract([:database, :ux, :analytics_instrumentation]) if stable_branch.valid_stable_branch?
 
 if changes.any?
   random_roulette_spins = roulette.spin(nil, categories, timezone_experiment: false)