Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/scripts/used-feature-flags b/scripts/used-feature-flags
index 07b8d2063ef..7ef3dbafd36 100755
--- a/scripts/used-feature-flags
+++ b/scripts/used-feature-flags
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'set'
+
 class String
   def red
     "\e[31m#{self}\e[0m"
@@ -37,6 +39,9 @@ flags_paths.each do |flags_path|
   Dir.glob(flags_path).each do |path|
     feature_flag_name = File.basename(path, '.yml')
 
+    # TODO: we need a better way of tracking use of Gitaly FF across Gitaly and GitLab
+    next if feature_flag_name.start_with?('gitaly_')
+
     all_flags[feature_flag_name] = File.exist?(File.join('tmp', 'feature_flags', feature_flag_name + '.used'))
   end
 end