Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 5 deletions

diff --git a/scripts/failed_tests.rb b/scripts/failed_tests.rb
index f828155f6f0..beb0a21637a 100755
--- a/scripts/failed_tests.rb
+++ b/scripts/failed_tests.rb
@@ -5,7 +5,7 @@ require 'optparse'
 require 'fileutils'
 require 'uri'
 require 'json'
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 
 class FailedTests
   DEFAULT_OPTIONS = {
diff --git a/scripts/feature_flags/used-feature-flags b/scripts/feature_flags/used-feature-flags
index 7bfe4a89634..b3005c3cba5 100755
--- a/scripts/feature_flags/used-feature-flags
+++ b/scripts/feature_flags/used-feature-flags
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 require 'fileutils'
 require_relative '../../lib/gitlab_edition'
 
diff --git a/scripts/merge-auto-explain-logs b/scripts/merge-auto-explain-logs
index 114afc580d0..9379189a9d3 100755
--- a/scripts/merge-auto-explain-logs
+++ b/scripts/merge-auto-explain-logs
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 require 'zlib'
 
 # Load query analyzers
diff --git a/scripts/setup/generate-as-if-foss-env.rb b/scripts/setup/generate-as-if-foss-env.rb
index ee688e4f1d0..9e93b470558 100755
--- a/scripts/setup/generate-as-if-foss-env.rb
+++ b/scripts/setup/generate-as-if-foss-env.rb
@@ -3,7 +3,7 @@
 
 # In spec/scripts/setup/generate_as_if_foss_env_spec.rb we completely stub it
 require 'gitlab' unless Object.const_defined?(:Gitlab)
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 
 class GenerateAsIfFossEnv
   def initialize
diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index 8771b112021..abbf30c7e2d 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 require 'test_file_finder'
 
 # These tests run a sanity check on the mapping file `tests.yml`