Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

2 files changed, 13 insertions, 6 deletions

diff --git a/tooling/bin/find_only_allowed_files_changes b/tooling/bin/find_only_allowed_files_changes
index c40048c66fa..1e903a4199f 100755
--- a/tooling/bin/find_only_allowed_files_changes
+++ b/tooling/bin/find_only_allowed_files_changes
@@ -3,6 +3,8 @@
 
 require_relative '../lib/tooling/find_changes'
 
+ALLOWED_FILE_TYPES = ['.js', '.vue', '.md', '.scss'].freeze
+
 if Tooling::FindChanges.new(from: :api).only_allowed_files_changed
   puts "Only files with extensions #{ALLOWED_FILE_TYPES.join(', ')} were changed"
   exit 0
diff --git a/tooling/bin/gettext_extractor b/tooling/bin/gettext_extractor
index 39f029616df..c430e89a9d3 100755
--- a/tooling/bin/gettext_extractor
+++ b/tooling/bin/gettext_extractor
@@ -4,6 +4,7 @@
 require_relative '../lib/tooling/gettext_extractor'
 
 pot_file = ARGV.shift
+silent = '--silent' in ARGV
 
 if !pot_file || !Dir.exist?(File.dirname(pot_file))
   abort <<~MSG
@@ -12,9 +13,11 @@ if !pot_file || !Dir.exist?(File.dirname(pot_file))
   MSG
 end
 
-puts <<~MSG
-  Extracting translatable strings from source files...
-MSG
+unless silent
+  puts <<~MSG
+    Extracting translatable strings from source files...
+  MSG
+end
 
 root_dir = File.expand_path('../../', __dir__)
 
@@ -24,6 +27,8 @@ extractor = Tooling::GettextExtractor.new(
 
 File.write(pot_file, extractor.generate_pot)
 
-puts <<~MSG
-  All done. Please commit the changes to `#{pot_file}`.
-MSG
+unless silent
+  puts <<~MSG
+    All done. Please commit the changes to `#{pot_file}`.
+  MSG
+end