Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 44 insertions, 18 deletions

diff --git a/tooling/danger/changelog.rb b/tooling/danger/changelog.rb
index 672d23d58e4..065c737050e 100644
--- a/tooling/danger/changelog.rb
+++ b/tooling/danger/changelog.rb
@@ -18,29 +18,35 @@ module Tooling
       CHANGELOG_MODIFIED_URL_TEXT = "**CHANGELOG.md was edited.** Please remove the additions and create a CHANGELOG entry.\n\n"
       CHANGELOG_MISSING_URL_TEXT = "**[CHANGELOG missing](https://docs.gitlab.com/ee/development/changelog.html)**:\n\n"
 
-      OPTIONAL_CHANGELOG_MESSAGE = <<~MSG
-      If you want to create a changelog entry for GitLab FOSS, run the following:
+      OPTIONAL_CHANGELOG_MESSAGE = {
+        local: "If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.",
+        ci: <<~MSG
+        If you want to create a changelog entry for GitLab FOSS, run the following:
 
-          #{CREATE_CHANGELOG_COMMAND}
+            #{CREATE_CHANGELOG_COMMAND}
 
-      If you want to create a changelog entry for GitLab EE, run the following instead:
+        If you want to create a changelog entry for GitLab EE, run the following instead:
 
-          #{CREATE_EE_CHANGELOG_COMMAND}
+            #{CREATE_EE_CHANGELOG_COMMAND}
 
-      If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.
-      MSG
+        If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.
+        MSG
+      }.freeze
 
       REQUIRED_CHANGELOG_REASONS = {
         db_changes: 'introduces a database migration',
         feature_flag_removed: 'removes a feature flag'
       }.freeze
-      REQUIRED_CHANGELOG_MESSAGE = <<~MSG
-      To create a changelog entry, run the following:
+      REQUIRED_CHANGELOG_MESSAGE = {
+        local: "This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).",
+        ci: <<~MSG
+        To create a changelog entry, run the following:
 
-          #{CREATE_CHANGELOG_COMMAND}
+            #{CREATE_CHANGELOG_COMMAND}
 
-      This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).
-      MSG
+        This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).
+        MSG
+      }.freeze
 
       def required_reasons
         [].tap do |reasons|
@@ -67,20 +73,20 @@ module Tooling
 
       def modified_text
         CHANGELOG_MODIFIED_URL_TEXT +
-          format(OPTIONAL_CHANGELOG_MESSAGE, mr_iid: helper.mr_iid, mr_title: sanitized_mr_title)
+          (helper.ci? ? format(OPTIONAL_CHANGELOG_MESSAGE[:ci], mr_iid: helper.mr_iid, mr_title: sanitized_mr_title) : OPTIONAL_CHANGELOG_MESSAGE[:local])
       end
 
       def required_texts
         required_reasons.each_with_object({}) do |required_reason, memo|
           memo[required_reason] =
             CHANGELOG_MISSING_URL_TEXT +
-              format(REQUIRED_CHANGELOG_MESSAGE, reason: REQUIRED_CHANGELOG_REASONS.fetch(required_reason), mr_iid: helper.mr_iid, mr_title: sanitized_mr_title)
+              (helper.ci? ? format(REQUIRED_CHANGELOG_MESSAGE[:ci], reason: REQUIRED_CHANGELOG_REASONS.fetch(required_reason), mr_iid: helper.mr_iid, mr_title: sanitized_mr_title) : REQUIRED_CHANGELOG_MESSAGE[:local])
         end
       end
 
       def optional_text
         CHANGELOG_MISSING_URL_TEXT +
-          format(OPTIONAL_CHANGELOG_MESSAGE, mr_iid: helper.mr_iid, mr_title: sanitized_mr_title)
+          (helper.ci? ? format(OPTIONAL_CHANGELOG_MESSAGE[:ci], mr_iid: helper.mr_iid, mr_title: sanitized_mr_title) : OPTIONAL_CHANGELOG_MESSAGE[:local])
       end
 
       private
diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb
index 4458000261f..7aac0de0b6b 100644
--- a/tooling/danger/project_helper.rb
+++ b/tooling/danger/project_helper.rb
@@ -4,9 +4,11 @@ module Tooling
   module Danger
     module ProjectHelper
       LOCAL_RULES ||= %w[
+        changelog
         changes_size
         commit_messages
         database
+        datateam
         documentation
         duplicate_yarn_dependencies
         eslint
@@ -20,7 +22,6 @@ module Tooling
 
       CI_ONLY_RULES ||= %w[
         ce_ee_vue_templates
-        changelog
         ci_templates
         metadata
         feature_flag
@@ -30,20 +31,25 @@ module Tooling
         specs
       ].freeze
 
-      MESSAGE_PREFIX = '==>'.freeze
+      MESSAGE_PREFIX = '==>'
 
       # First-match win, so be sure to put more specific regex at the top...
       CATEGORIES = {
-        [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend],
+        [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend, :product_intelligence],
 
         %r{\A(ee/)?config/feature_flags/} => :feature_flag,
 
         %r{\A(ee/)?(changelogs/unreleased)(-ee)?/} => :changelog,
 
+        %r{\Adoc/development/usage_ping/dictionary\.md\z} => [:docs, :product_intelligence],
         %r{\Adoc/.*(\.(md|png|gif|jpg))\z} => :docs,
         %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs,
         %r{\Adata/whats_new/} => :docs,
 
+        %r{\A(
+          app/assets/javascripts/tracking\.js |
+          spec/frontend/tracking_spec\.js
+        )\z}x => [:frontend, :product_intelligence],
         %r{\A(ee/)?app/(assets|views)/} => :frontend,
         %r{\A(ee/)?public/} => :frontend,
         %r{\A(ee/)?spec/(javascripts|frontend)/} => :frontend,
@@ -73,6 +79,7 @@ module Tooling
         %r{\A(ee/)?db/(geo/)?(migrate|post_migrate)/} => [:database, :migration],
         %r{\A(ee/)?db/(?!fixtures)[^/]+} => :database,
         %r{\A(ee/)?lib/gitlab/(database|background_migration|sql|github_import)(/|\.rb)} => :database,
+        %r{\A(app/services/authorized_project_update/find_records_due_for_refresh_service)(/|\.rb)} => :database,
         %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => :database,
         %r{\A(ee/)?app/finders/} => :database,
         %r{\Arubocop/cop/migration(/|\.rb)} => :database,
@@ -95,6 +102,17 @@ module Tooling
         %r{\A(ee/)?spec/support/shared_contexts/features/} => :test,
         %r{\A(ee/)?spec/support/helpers/features/} => :test,
 
+        %r{\A(ee/)?lib/gitlab/usage_data_counters/.*\.yml\z} => [:product_intelligence],
+        %r{\A(ee/)?config/metrics/((.*\.yml)|(schema\.json))\z} => [:product_intelligence],
+        %r{\A(ee/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :product_intelligence],
+        %r{\A(
+          lib/gitlab/tracking\.rb |
+          spec/lib/gitlab/tracking_spec\.rb |
+          app/helpers/tracking_helper\.rb |
+          spec/helpers/tracking_helper_spec\.rb |
+          lib/generators/rails/usage_metric_definition_generator\.rb |
+          spec/lib/generators/usage_metric_definition_generator_spec\.rb |
+          generator_templates/usage_metric_definition/metric_definition\.yml)\z}x => [:backend, :product_intelligence],
         %r{\A(ee/)?app/(?!assets|views)[^/]+} => :backend,
         %r{\A(ee/)?(bin|config|generator_templates|lib|rubocop)/} => :backend,
         %r{\A(ee/)?spec/} => :backend,
@@ -106,6 +124,8 @@ module Tooling
 
         %r{\A(ee/)?qa/} => :qa,
 
+        %r{\Aworkhorse/.*} => :workhorse,
+
         # Files that don't fit into any category are marked with :none
         %r{\A(ee/)?changelogs/} => :none,
         %r{\Alocale/gitlab\.pot\z} => :none,