Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 11 deletions

diff --git a/danger/metadata/Dangerfile b/danger/metadata/Dangerfile
index 27dda687f6a..537f55ed649 100644
--- a/danger/metadata/Dangerfile
+++ b/danger/metadata/Dangerfile
@@ -4,24 +4,21 @@
 
 DEFAULT_BRANCH = 'master'
 
-THROUGHPUT_LABELS = [
-  'Community contribution',
-  'security',
-  'bug',
-  'feature',
+TYPE_LABELS = [
+  'type::feature',
   'feature::addition',
-  'feature::maintenance',
-  'tooling',
+  'type::maintenance',
+  'type::tooling',
   'tooling::pipelines',
   'tooling::workflow',
-  'documentation'
+  'type::bug'
 ].freeze
 
 if gitlab.mr_body.size < 5
   fail "Please provide a proper merge request description."
 end
 
-if (THROUGHPUT_LABELS & gitlab.mr_labels).empty?
+if (TYPE_LABELS & gitlab.mr_labels).empty?
   warn 'Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request.'
 end
 
diff --git a/danger/specialization_labels/Dangerfile b/danger/specialization_labels/Dangerfile
index e86d66f5fbc..e42e17762e4 100644
--- a/danger/specialization_labels/Dangerfile
+++ b/danger/specialization_labels/Dangerfile
@@ -8,7 +8,7 @@ SPECIALIZATIONS = {
   frontend: 'frontend',
   docs: 'documentation',
   qa: 'QA',
-  tooling: 'tooling',
+  tooling: 'type::tooling',
   ci_template: 'ci::templates',
   feature_flag: 'feature flag'
 }.freeze
diff --git a/danger/specs/Dangerfile b/danger/specs/Dangerfile
index 117eaf61062..067fb62807a 100644
--- a/danger/specs/Dangerfile
+++ b/danger/specs/Dangerfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 NO_SPECS_LABELS = [
-  'tooling',
+  'type::tooling',
   'tooling::pipelines',
   'tooling::workflow',
   'documentation',