Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 26 insertions, 23 deletions

diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
index 6c192c3a311..80e832da508 100644
--- a/danger/roulette/Dangerfile
+++ b/danger/roulette/Dangerfile
@@ -40,25 +40,30 @@ MARKDOWN
 
 OPTIONAL_REVIEW_TEMPLATE = "%{role} review is optional for %{category}".freeze
 NOT_AVAILABLE_TEMPLATE = 'No %{role} available'.freeze
-TIMEZONE_EXPERIMENT = true
 
-def mr_author
-  roulette.team.find { |person| person.username == gitlab.mr_author }
+def note_for_spins_role(spins, role)
+  spins.each do |spin|
+    note = note_for_spin_role(spin, role)
+
+    return note if note
+  end
+
+  NOT_AVAILABLE_TEMPLATE % { role: role }
 end
 
-def note_for_category_role(spin, role)
+def note_for_spin_role(spin, role)
   if spin.optional_role == role
     return OPTIONAL_REVIEW_TEMPLATE % { role: role.capitalize, category: helper.label_for_category(spin.category) }
   end
 
-  spin.public_send(role)&.markdown_name(timezone_experiment: TIMEZONE_EXPERIMENT, author: mr_author) || NOT_AVAILABLE_TEMPLATE % { role: role } # rubocop:disable GitlabSecurity/PublicSend
+  spin.public_send(role)&.markdown_name(timezone_experiment: spin.timezone_experiment, author: roulette.team_mr_author) # rubocop:disable GitlabSecurity/PublicSend
 end
 
-def markdown_row_for_spin(spin)
-  reviewer_note = note_for_category_role(spin, :reviewer)
-  maintainer_note = note_for_category_role(spin, :maintainer)
+def markdown_row_for_spins(category, spins_array)
+  reviewer_note = note_for_spins_role(spins_array, :reviewer)
+  maintainer_note = note_for_spins_role(spins_array, :maintainer)
 
-  "| #{helper.label_for_category(spin.category)} | #{reviewer_note} | #{maintainer_note} |"
+  "| #{helper.label_for_category(category)} | #{reviewer_note} | #{maintainer_note} |"
 end
 
 changes = helper.changes_by_category
@@ -70,26 +75,18 @@ changes.delete(:docs)
 categories = changes.keys - [:unknown]
 
 # Ensure to spin for database reviewer/maintainer when ~database is applied (e.g. to review SQL queries)
-categories << :database if gitlab.mr_labels.include?('database') && !categories.include?(:database)
+categories << :database if helper.gitlab_helper&.mr_labels&.include?('database') && !categories.include?(:database)
 
 if changes.any?
   project = helper.project_name
-  branch_name = gitlab.mr_json['source_branch']
 
-  markdown(MESSAGE)
+  random_roulette_spins = roulette.spin(project, categories, timezone_experiment: false)
 
-  roulette_spins = roulette.spin(project, categories, branch_name, timezone_experiment: TIMEZONE_EXPERIMENT)
-  rows = roulette_spins.map do |spin|
-    # MR includes QA changes, but also other changes, and author isn't an SET
-    if spin.category == :qa && categories.size > 1 && mr_author && !mr_author.reviewer?(project, spin.category, [])
-      spin.optional_role = :maintainer
-    end
-
-    spin.optional_role = :maintainer if spin.category == :test
-
-    markdown_row_for_spin(spin)
+  rows = random_roulette_spins.map do |spin|
+    markdown_row_for_spins(spin.category, [spin])
   end
 
+  markdown(MESSAGE)
   markdown(CATEGORY_TABLE_HEADER + rows.join("\n")) unless rows.empty?
 
   unknown = changes.fetch(:unknown, [])
diff --git a/danger/telemetry/Dangerfile b/danger/telemetry/Dangerfile
index b749bd3b80b..6cfc1a005c3 100644
--- a/danger/telemetry/Dangerfile
+++ b/danger/telemetry/Dangerfile
@@ -8,6 +8,11 @@ Please check the ~telemetry [guide](https://docs.gitlab.com/ee/development/telem
 
 MSG
 
+UPDATE_METRICS_DEFINITIONS_MESSAGE = <<~MSG
+  When adding, changing, or updating metrics, please update the [Event dictionary Usage Ping table](https://docs.gitlab.com/ee/development/telemetry/event_dictionary.html#usage-ping).
+
+MSG
+
 tracking_files = [
   'lib/gitlab/tracking.rb',
   'spec/lib/gitlab/tracking_spec.rb',
@@ -17,13 +22,14 @@ tracking_files = [
   'spec/frontend/tracking_spec.js'
 ]
 
-usage_data_changed_files = git.modified_files.grep(%r{usage_data})
+usage_data_changed_files = helper.changed_files(/usage_data/)
 snowplow_events_changed_files = git.modified_files & tracking_files
 
 changed_files = (usage_data_changed_files + snowplow_events_changed_files)
 
 if changed_files.any?
   warn format(TELEMETRY_CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(changed_files))
+  warn format(UPDATE_METRICS_DEFINITIONS_MESSAGE) unless helper.changed_files(/usage_ping\.md/).any?
 
   telemetry_labels = ['telemetry']
   telemetry_labels << 'telemetry::review pending' unless helper.mr_has_labels?('telemetry::reviewed')