Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 6 deletions

diff --git a/.rubocop_todo/graphql/resource_not_available_error.yml b/.rubocop_todo/graphql/resource_not_available_error.yml
index 24eb6379a16..afe976e0f69 100644
--- a/.rubocop_todo/graphql/resource_not_available_error.yml
+++ b/.rubocop_todo/graphql/resource_not_available_error.yml
@@ -30,7 +30,6 @@ Graphql/ResourceNotAvailableError:
     - 'app/graphql/resolvers/projects/snippets_resolver.rb'
     - 'app/graphql/types/container_repository_details_type.rb'
     - 'app/graphql/types/container_repository_type.rb'
-    - 'ee/app/graphql/ee/types/query_type.rb'
     - 'ee/app/graphql/mutations/ai/action.rb'
     - 'ee/app/graphql/mutations/audit_events/instance_external_audit_event_destinations/base.rb'
     - 'ee/app/graphql/mutations/ci/ai/generate_config.rb'
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 4df62576a98..cab3185a377 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -640,7 +640,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/graphql/ee/types/branch_protections/base_access_level_type.rb'
     - 'ee/app/graphql/ee/types/branch_rules/branch_protection_type.rb'
     - 'ee/app/graphql/ee/types/ci/runner_countable_connection_type.rb'
-    - 'ee/app/graphql/ee/types/clusters/agent_type.rb'
     - 'ee/app/graphql/ee/types/deployment_type.rb'
     - 'ee/app/graphql/ee/types/environment_type.rb'
     - 'ee/app/graphql/ee/types/group_type.rb'
@@ -649,7 +648,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/graphql/ee/types/permission_types/deployment.rb'
     - 'ee/app/graphql/ee/types/project_type.rb'
     - 'ee/app/graphql/ee/types/projects/branch_rule_type.rb'
-    - 'ee/app/graphql/ee/types/query_type.rb'
     - 'ee/app/graphql/ee/types/subscription_type.rb'
     - 'ee/app/graphql/ee/types/user_merge_request_interaction_type.rb'
     - 'ee/app/graphql/mutations/analytics/devops_adoption/enabled_namespaces/bulk_enable.rb'
diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
index 2c3435ea036..0bfdf721a2b 100644
--- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml
+++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
@@ -161,7 +161,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'ee/app/controllers/projects/protected_environments_controller.rb'
     - 'ee/app/finders/groups_with_templates_finder.rb'
     - 'ee/app/finders/status_page/incidents_finder.rb'
-    - 'ee/app/graphql/ee/types/clusters/agent_type.rb'
     - 'ee/app/graphql/ee/types/repository/blob_type.rb'
     - 'ee/app/graphql/types/analytics/devops_adoption/enabled_namespace_type.rb'
     - 'ee/app/graphql/types/analytics/devops_adoption/snapshot_type.rb'
diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml
index 48419c3721e..2cc67591fdd 100644
--- a/.rubocop_todo/rspec/before_all_role_assignment.yml
+++ b/.rubocop_todo/rspec/before_all_role_assignment.yml
@@ -172,7 +172,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/graphql/ee/mutations/ci/job_token_scope/add_project_spec.rb'
     - 'ee/spec/graphql/ee/mutations/ci/job_token_scope/remove_project_spec.rb'
     - 'ee/spec/graphql/ee/resolvers/project_issues_resolver_spec.rb'
-    - 'ee/spec/graphql/ee/types/clusters/agent_type_spec.rb'
     - 'ee/spec/graphql/ee/types/group_type_spec.rb'
     - 'ee/spec/graphql/mutations/boards/epic_boards/create_spec.rb'
     - 'ee/spec/graphql/mutations/boards/epic_boards/destroy_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index 2519a34f844..8ec7a156ae9 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -134,7 +134,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/graphql/ee/types/board_type_spec.rb'
     - 'ee/spec/graphql/ee/types/boards/board_issue_input_type_spec.rb'
     - 'ee/spec/graphql/ee/types/ci/pipeline_merge_request_type_enum_spec.rb'
-    - 'ee/spec/graphql/ee/types/clusters/agent_type_spec.rb'
     - 'ee/spec/graphql/ee/types/compliance_management/compliance_framework_type_spec.rb'
     - 'ee/spec/graphql/ee/types/environment_type_spec.rb'
     - 'ee/spec/graphql/ee/types/group_type_spec.rb'