From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Aug 2021 09:08:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 danger/metadata/Dangerfile              | 2 +-
 danger/pajamas/Dangerfile               | 5 -----
 danger/product_intelligence/Dangerfile  | 9 ---------
 danger/roulette/Dangerfile              | 4 ++--
 danger/specialization_labels/Dangerfile | 2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'danger')

diff --git a/danger/metadata/Dangerfile b/danger/metadata/Dangerfile
index a08808f674f..d2e85109d63 100644
--- a/danger/metadata/Dangerfile
+++ b/danger/metadata/Dangerfile
@@ -20,7 +20,7 @@ if gitlab.mr_body.size < 5
 end
 
 if (THROUGHPUT_LABELS & gitlab.mr_labels).empty?
-  warn 'Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#data-classification) to this merge request.'
+  warn 'Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request.'
 end
 
 unless gitlab.mr_json["assignee"]
diff --git a/danger/pajamas/Dangerfile b/danger/pajamas/Dangerfile
index dda0218e918..a3ff1126bd1 100644
--- a/danger/pajamas/Dangerfile
+++ b/danger/pajamas/Dangerfile
@@ -20,11 +20,6 @@ PATTERNS = %w[
   <tabs
   bs-callout
   deprecated-modal
-  gl-deprecated-button
-  gl-deprecated-dropdown
-  gl-deprecated-dropdown-divider
-  gl-deprecated-dropdown-header
-  gl-deprecated-dropdown-item
   has-tooltip
   has_tooltip
   initDeprecatedJQueryDropdown
diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile
index 5469e8a87a5..ae58cf4588c 100644
--- a/danger/product_intelligence/Dangerfile
+++ b/danger/product_intelligence/Dangerfile
@@ -10,20 +10,11 @@ Please check the ~"product intelligence" [guide](https://docs.gitlab.com/ee/deve
 
 MSG
 
-UPDATE_DICTIONARY_MESSAGE = <<~MSG
-  When adding, changing, or updating metrics, please update the [Metrics Dictionary](https://docs.gitlab.com/ee/development/usage_ping/dictionary.html)
-
-  ```shell
-  bundle exec rake gitlab:usage_data:generate_metrics_dictionary
-  ```
-MSG
-
 # exit if not matching files
 matching_changed_files = product_intelligence.matching_changed_files
 return unless matching_changed_files.any?
 
 warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(matching_changed_files))
-fail format(UPDATE_DICTIONARY_MESSAGE) if product_intelligence.need_dictionary_changes?
 
 labels = product_intelligence.missing_labels
 return unless labels.any?
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
index c8ea494bc41..cd23028a379 100644
--- a/danger/roulette/Dangerfile
+++ b/danger/roulette/Dangerfile
@@ -40,9 +40,9 @@ There are no reviewer and maintainer suggestions for the changes in this MR.
 MARKDOWN
 
 UNKNOWN_FILES_MESSAGE = <<MARKDOWN
-### Uncategorised files
+### Uncategorized files
 
-These files couldn't be categorised, so Danger was unable to suggest a reviewer.
+These files couldn't be categorized, so Danger was unable to suggest a reviewer.
 Please consider creating a merge request to
 [add support](https://gitlab.com/gitlab-org/gitlab/blob/master/tooling/danger/project_helper.rb)
 for them.
diff --git a/danger/specialization_labels/Dangerfile b/danger/specialization_labels/Dangerfile
index 35125f20b14..e86d66f5fbc 100644
--- a/danger/specialization_labels/Dangerfile
+++ b/danger/specialization_labels/Dangerfile
@@ -8,7 +8,7 @@ SPECIALIZATIONS = {
   frontend: 'frontend',
   docs: 'documentation',
   qa: 'QA',
-  engineering_productivity: 'Engineering Productivity',
+  tooling: 'tooling',
   ci_template: 'ci::templates',
   feature_flag: 'feature flag'
 }.freeze
-- 
cgit v1.2.3