Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 53 deletions

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index d8d493b4731..ee095512645 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3920,7 +3920,6 @@ Layout/LineLength:
     - 'spec/features/groups/settings/repository_spec.rb'
     - 'spec/features/groups_spec.rb'
     - 'spec/features/ide/static_object_external_storage_csp_spec.rb'
-    - 'spec/features/incidents/user_views_incident_spec.rb'
     - 'spec/features/invites_spec.rb'
     - 'spec/features/issuables/issuable_list_spec.rb'
     - 'spec/features/issuables/markdown_references/internal_references_spec.rb'
diff --git a/.rubocop_todo/rails/negate_include.yml b/.rubocop_todo/rails/negate_include.yml
index 7bf78b82b60..c3f9ac25e7e 100644
--- a/.rubocop_todo/rails/negate_include.yml
+++ b/.rubocop_todo/rails/negate_include.yml
@@ -1,30 +1,28 @@
 ---
 # Cop supports --auto-correct.
 Rails/NegateInclude:
-  # Offense count: 65
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/finders/projects_finder.rb'
     - 'app/helpers/application_settings_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/tree_helper.rb'
-    - 'app/models/concerns/timebox.rb'
     - 'app/models/integrations/chat_message/pipeline_message.rb'
+    - 'app/models/integrations/field.rb'
     - 'app/models/label.rb'
     - 'app/models/merge_request.rb'
+    - 'app/models/milestone.rb'
     - 'app/services/todo_service.rb'
+    - 'app/services/work_items/parent_links/create_service.rb'
     - 'config/application.rb'
     - 'config/initializers/1_settings.rb'
     - 'danger/roulette/Dangerfile'
     - 'ee/app/finders/security/pipeline_vulnerabilities_finder.rb'
-    - 'ee/app/models/ee/epic.rb'
     - 'ee/app/models/ee/vulnerability.rb'
     - 'ee/app/services/epic_issues/create_service.rb'
     - 'ee/app/services/security/ingestion/tasks/ingest_remediations.rb'
     - 'ee/app/services/security/security_orchestration_policies/validate_policy_service.rb'
     - 'lib/api/maven_packages.rb'
-    - 'lib/generators/gitlab/usage_metric_generator.rb'
     - 'lib/gitlab/background_migration/legacy_upload_mover.rb'
     - 'lib/gitlab/ci/build/rules/rule/clause/exists.rb'
     - 'lib/gitlab/ci/parsers/coverage/sax_document.rb'
@@ -38,11 +36,10 @@ Rails/NegateInclude:
     - 'lib/gitlab/task_helpers.rb'
     - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab_edition.rb'
+    - 'qa/qa/page/merge_request/show.rb'
     - 'qa/qa/runtime/ip_address.rb'
     - 'qa/qa/support/run.rb'
     - 'qa/qa/tools/delete_test_users.rb'
-    - 'qa/qa/vendor/jenkins/page/configure_job.rb'
-    - 'qa/qa/vendor/jenkins/page/last_job_console.rb'
     - 'rubocop/cop/gitlab/feature_available_usage.rb'
     - 'rubocop/cop/graphql/id_type.rb'
     - 'rubocop/cop/migration/add_reference.rb'
@@ -56,3 +53,4 @@ Rails/NegateInclude:
     - 'spec/support/matchers/pushed_frontend_feature_flags_matcher.rb'
     - 'spec/support/shared_contexts/markdown_golden_master_shared_examples.rb'
     - 'spec/uploaders/object_storage_spec.rb'
+    - 'tooling/danger/specs.rb'
diff --git a/.rubocop_todo/rails/where_exists.yml b/.rubocop_todo/rails/where_exists.yml
deleted file mode 100644
index 77722549722..00000000000
--- a/.rubocop_todo/rails/where_exists.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-# Cop supports --auto-correct.
-Rails/WhereExists:
-  # Offense count: 48
-  # Temporarily disabled due to too many offenses
-  Enabled: false
-  Exclude:
-    - 'app/models/application_setting/term.rb'
-    - 'app/models/ci/pipeline_artifact.rb'
-    - 'app/models/ci/ref.rb'
-    - 'app/models/clusters/agent.rb'
-    - 'app/models/concerns/has_wiki.rb'
-    - 'app/models/concerns/noteable.rb'
-    - 'app/models/container_repository.rb'
-    - 'app/models/design_management/design.rb'
-    - 'app/models/group.rb'
-    - 'app/models/group_deploy_token.rb'
-    - 'app/models/label.rb'
-    - 'app/models/lfs_object.rb'
-    - 'app/models/merge_request_diff.rb'
-    - 'app/models/namespace.rb'
-    - 'app/models/project.rb'
-    - 'app/models/protected_branch/push_access_level.rb'
-    - 'app/services/projects/transfer_service.rb'
-    - 'app/services/todos/destroy/unauthorized_features_service.rb'
-    - 'db/migrate/20210422195929_create_elastic_reindexing_slices.rb'
-    - 'ee/app/models/approval_merge_request_rule_source.rb'
-    - 'ee/app/models/concerns/ee/protected_ref_access.rb'
-    - 'ee/app/models/ee/epic.rb'
-    - 'ee/app/models/ee/group_member.rb'
-    - 'ee/app/models/ee/milestone_release.rb'
-    - 'ee/app/models/geo_node.rb'
-    - 'ee/app/models/merge_requests/external_status_check.rb'
-    - 'ee/app/models/merge_train.rb'
-    - 'ee/app/workers/concerns/elastic/indexing_control.rb'
-    - 'lib/gitlab/auth.rb'
-    - 'lib/gitlab/checks/matching_merge_request.rb'
-    - 'lib/gitlab/database/partitioning/detached_partition_dropper.rb'
-    - 'spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb'
-    - 'spec/migrations/recreate_index_security_ci_builds_on_name_and_id_parser_features_spec.rb'
-    - 'spec/migrations/recreate_index_security_ci_builds_on_name_and_id_parser_with_new_features_spec.rb'
-    - 'spec/models/user_spec.rb'
-    - 'spec/services/clusters/cleanup/service_account_service_spec.rb'
-    - 'spec/services/clusters/destroy_service_spec.rb'