Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/scripts/lint-vendored-gems.sh b/scripts/lint-vendored-gems.sh
new file mode 100755
index 00000000000..ac8b837bbd1
--- /dev/null
+++ b/scripts/lint-vendored-gems.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Rubocop doesn't have a good way to run excluded files without a separate invocation:
+# https://github.com/rubocop/rubocop/issues/6323
+find vendor/gems -name \*.gemspec | xargs bundle exec rubocop --only Gemspec/AvoidExecutingGit
diff --git a/scripts/static-analysis b/scripts/static-analysis
index afebb86bef8..1e9fe1cc724 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -59,7 +59,8 @@ class StaticAnalysis
     Task.new(%w[yarn run block-dependencies], 1),
     Task.new(%w[yarn run check-dependencies], 1),
     Task.new(%w[scripts/lint-rugged], 1),
-    Task.new(%w[scripts/gemfile_lock_changed.sh], 1)
+    Task.new(%w[scripts/gemfile_lock_changed.sh], 1),
+    Task.new(%w[scripts/lint-vendored-gems.sh], 1)
   ].compact.freeze
 
   def run_tasks!(options = {})