Merge branch '334994-renaming-a-feature-flag-breaks-danger' into 'master'

Use gitlab-dangerfiles to 2.2.1

See merge request gitlab-org/gitlab!65258

Gemfile

@@ -394,7 +394,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
+  gem 'gitlab-dangerfiles', '~> 2.2.1', require: false
 end
 
 group :development, :test, :coverage do

Gemfile.lock

@@ -229,7 +229,7 @@ GEM
     css_parser (1.7.0)
       addressable
     daemons (1.3.1)
-    danger (8.2.3)
+    danger (8.3.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -468,8 +468,9 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (2.1.2)
-      danger-gitlab
+    gitlab-dangerfiles (2.2.1)
+      danger (>= 8.3.1)
+      danger-gitlab (>= 8.0.0)
     gitlab-experiment (0.6.1)
       activesupport (>= 3.0)
       request_store (>= 1.0)
@@ -1488,7 +1489,7 @@ DEPENDENCIES
   gitaly (~> 14.1.0.pre.rc2)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 2.1.2)
+  gitlab-dangerfiles (~> 2.2.1)
   gitlab-experiment (~> 0.6.1)
   gitlab-fog-azure-rm (~> 1.1.1)
   gitlab-labkit (~> 0.18.0)

spec/tooling/danger/feature_flag_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Tooling::Danger::FeatureFlag do
 
   let(:fake_danger) { DangerSpecHelper.fake_danger.include(described_class) }
 
-  subject(:feature_flag) { fake_danger.new(git: fake_git) }
+  subject(:feature_flag) { fake_danger.new(helper: fake_helper) }
 
   describe '#feature_flag_files' do
     let(:feature_flag_files) do

tooling/danger/feature_flag.rb

@@ -10,7 +10,8 @@ module Tooling
       #   - :modified
       #   - :deleted
       def feature_flag_files(change_type:)
-        files = git.public_send("#{change_type}_files") # rubocop:disable GitlabSecurity/PublicSend
+        files = helper.public_send("#{change_type}_files") # rubocop:disable GitlabSecurity/PublicSend
+
         files.select { |path| path =~ %r{\A(ee/)?config/feature_flags/} }.map { |path| Found.new(path) }
       end