Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 6 insertions, 20 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d60ab9b2fcc..0189a3d6372 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -141,7 +141,7 @@ Lint/BinaryOperatorWithIdenticalOperands:
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
     - 'spec/helpers/visibility_level_helper_spec.rb'
     - 'spec/lib/gitlab/conan_token_spec.rb'
-    - 'spec/lib/gitlab/danger/sidekiq_queues_spec.rb'
+    - 'spec/tooling/danger/sidekiq_queues_spec.rb'
     - 'spec/lib/gitlab/git/conflict/parser_spec.rb'
     - 'spec/lib/gitlab/graphql/lazy_spec.rb'
     - 'spec/models/ci/build_trace_chunk_spec.rb'
@@ -155,20 +155,6 @@ Lint/BinaryOperatorWithIdenticalOperands:
 Lint/ConstantDefinitionInBlock:
   Enabled: false
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Lint/DeprecatedOpenSSLConstant:
-  Exclude:
-    - 'app/services/clusters/kubernetes/configure_istio_ingress_service.rb'
-    - 'ee/lib/gitlab/geo/oauth/logout_state.rb'
-    - 'lib/gitlab/conan_token.rb'
-    - 'lib/gitlab/gitaly_client.rb'
-    - 'lib/gitlab/kubernetes/helm/v2/certificate.rb'
-    - 'spec/lib/gitlab/conan_token_spec.rb'
-    - 'spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb'
-    - 'spec/support/helpers/smime_helper.rb'
-    - 'spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb'
-
 # Offense count: 1
 Lint/DuplicateRequire:
   Exclude:
@@ -185,8 +171,8 @@ Lint/EmptyFile:
 # Cop supports --auto-correct.
 Lint/IdentityComparison:
   Exclude:
-    - 'spec/lib/gitlab/danger/weightage/maintainers_spec.rb'
-    - 'spec/lib/gitlab/danger/weightage/reviewers_spec.rb'
+    - 'spec/tooling/danger/weightage/maintainers_spec.rb'
+    - 'spec/tooling/danger/weightage/reviewers_spec.rb'
 
 # Offense count: 184
 # Configuration parameters: MaximumRangeSize.
@@ -263,7 +249,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/banzai/filter/abstract_reference_filter.rb'
     - 'lib/declarative_policy/runner.rb'
     - 'lib/gitlab/conflict/file.rb'
-    - 'lib/gitlab/danger/roulette.rb'
+    - 'tooling/danger/roulette.rb'
     - 'lib/gitlab/diff/parser.rb'
     - 'lib/gitlab/rack_attack.rb'
     - 'lib/gitlab/sidekiq_cluster/cli.rb'
@@ -285,7 +271,7 @@ Metrics/PerceivedComplexity:
     - 'lib/banzai/renderer.rb'
     - 'lib/declarative_policy/runner.rb'
     - 'lib/gitlab/conflict/file.rb'
-    - 'lib/gitlab/danger/roulette.rb'
+    - 'tooling/danger/roulette.rb'
     - 'lib/gitlab/rack_attack.rb'
     - 'lib/gitlab/sidekiq_cluster/cli.rb'
     - 'lib/gitlab/utils/merge_hash.rb'
@@ -629,7 +615,7 @@ Rails/IndexBy:
     - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb'
     - 'ee/lib/gitlab/elastic/document_reference.rb'
     - 'ee/lib/gitlab/group_plans_preloader.rb'
-    - 'lib/gitlab/danger/sidekiq_queues.rb'
+    - 'tooling/danger/sidekiq_queues.rb'
     - 'lib/gitlab/database/count/reltuples_count_strategy.rb'
     - 'lib/gitlab/language_detection.rb'