Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 12 deletions

diff --git a/scripts/utils.sh b/scripts/utils.sh
index 4a5e74353f6..1d3c04dd64e 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -196,7 +196,7 @@ function install_gitlab_gem() {
 }
 
 function install_tff_gem() {
-  run_timed_command "gem install test_file_finder --no-document --version 0.1.4"
+  run_timed_command "gem install test_file_finder --no-document --version 0.2.1"
 }
 
 function install_activesupport_gem() {
diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index 0bf4db52698..672bbe15977 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -167,12 +167,6 @@ tests = [
   },
 
   {
-    explanation: 'Known events',
-    source: 'lib/gitlab/usage_data_counters/known_events/common.yml',
-    expected: ['spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb', 'spec/lib/gitlab/usage_data_spec.rb']
-  },
-
-  {
     explanation: 'FOSS mailer previews',
     source: 'app/mailers/previews/foo.rb',
     expected: ['spec/mailers/previews_spec.rb']
@@ -205,11 +199,6 @@ tests = [
   },
 
   {
-    explanation: 'https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/287#note_1192008962',
-    source: 'ee/lib/ee/gitlab/usage_data_counters/known_events/common.yml',
-    expected: ['ee/spec/config/metrics/every_metric_definition_spec.rb']
-  },
-  {
     explanation: 'https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/issues/146',
     source: 'config/feature_categories.yml',
     expected: ['spec/db/docs_spec.rb', 'ee/spec/lib/ee/gitlab/database/docs/docs_spec.rb']