Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/static-analysis b/scripts/static-analysis
index febfdbd1da4..2442455e630 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -25,16 +25,15 @@ class StaticAnalysis
     # Most of the time, RuboCop finishes in 30 seconds, but sometimes it can take around 1200 seconds so we set a
     # duration of 300 to lower the likelihood that it will run in the same job as another long task...
     %w[bundle exec rubocop --parallel] => 300,
-    %w[yarn run eslint] => 197,
-    %w[yarn run prettier-all] => 124,
+    %w[yarn run lint:eslint:all] => 197,
+    %w[yarn run lint:prettier] => 124,
     %w[bin/rake gettext:lint] => 96,
     %w[bundle exec license_finder] => 49,
-    %w[bin/rake scss_lint] => 38,
     %w[bin/rake lint:static_verification] => 22,
     %w[bin/rake gitlab:sidekiq:all_queues_yml:check] => 13,
     (Gitlab.ee? ? %w[bin/rake gitlab:sidekiq:sidekiq_queues_yml:check] : nil) => 13,
     %w[bin/rake config_lint] => 11,
-    %w[yarn run stylelint] => 9,
+    %w[yarn run lint:stylelint] => 9,
     %w[scripts/lint-conflicts.sh] => 0.59,
     %w[yarn run block-dependencies] => 0.35,
     %w[scripts/lint-rugged] => 0.23,