Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 12 deletions

diff --git a/scripts/static-analysis b/scripts/static-analysis
index fc917f1b975..a1859254459 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -20,22 +20,20 @@ class StaticAnalysis
   # contain values that a FOSS installation won't find. To work
   # around this we will only enable this task on EE installations.
   TASKS_BY_DURATIONS_SECONDS_DESC = {
-    %w[bin/rake lint:haml] => 488,
-    (Gitlab.ee? ? %w[bin/rake gettext:updated_check] : nil) => 410,
-    # 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 --except Gitlab/MarkUsedFeatureFlags] => 300,
+    %w[bin/rake lint:haml] => 800,
     # We need to disable the cache for this cop since it creates files under tmp/feature_flags/*.used,
     # the cache would prevent these files from being created.
     %w[bundle exec rubocop --only Gitlab/MarkUsedFeatureFlags --cache false] => 600,
-    %w[yarn run lint:eslint:all] => 264,
-    %w[yarn run lint:prettier] => 134,
-    %w[bin/rake gettext:lint] => 81,
-    %w[bundle exec license_finder] => 49,
-    %w[bin/rake lint:static_verification] => 24,
-    %w[bin/rake gitlab:sidekiq:all_queues_yml:check] => 12,
+    (Gitlab.ee? ? %w[bin/rake gettext:updated_check] : nil) => 360,
+    %w[yarn run lint:eslint:all] => 312,
+    %w[yarn run lint:prettier] => 162,
+    %w[bin/rake gettext:lint] => 65,
+    %w[bundle exec license_finder] => 61,
+    %w[bin/rake lint:static_verification] => 45,
+    %w[bundle exec rubocop --parallel] => 40,
+    %w[bin/rake config_lint] => 26,
+    %w[bin/rake gitlab:sidekiq:all_queues_yml:check] => 15,
     (Gitlab.ee? ? %w[bin/rake gitlab:sidekiq:sidekiq_queues_yml:check] : nil) => 11,
-    %w[bin/rake config_lint] => 11,
     %w[yarn run internal:stylelint] => 8,
     %w[scripts/lint-conflicts.sh] => 1,
     %w[yarn run block-dependencies] => 1,