Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 51 deletions

diff --git a/.rubocop_todo/graphql/ordered_arguments.yml b/.rubocop_todo/graphql/ordered_arguments.yml
deleted file mode 100644
index 1a30490e893..00000000000
--- a/.rubocop_todo/graphql/ordered_arguments.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-GraphQL/OrderedArguments:
-  Exclude:
-  - app/graphql/resolvers/base_issues_resolver.rb
-  - app/graphql/resolvers/design_management/designs_resolver.rb
-  - app/graphql/resolvers/design_management/version/design_at_version_resolver.rb
diff --git a/.rubocop_todo/graphql/ordered_fields.yml b/.rubocop_todo/graphql/ordered_fields.yml
index b6ddd018f4e..b7135d7aabb 100644
--- a/.rubocop_todo/graphql/ordered_fields.yml
+++ b/.rubocop_todo/graphql/ordered_fields.yml
@@ -1,55 +1,12 @@
 ---
 GraphQL/OrderedFields:
   Exclude:
-  - app/graphql/types/ci/runner_platform_type.rb
   - app/graphql/types/ci/runner_type.rb
-  - app/graphql/types/ci/stage_type.rb
-  - app/graphql/types/ci/status_action_type.rb
-  - app/graphql/types/ci/template_type.rb
-  - app/graphql/types/commit_type.rb
-  - app/graphql/types/container_expiration_policy_type.rb
-  - app/graphql/types/container_repository_tag_type.rb
   - app/graphql/types/container_repository_type.rb
-  - app/graphql/types/dependency_proxy/blob_type.rb
-  - app/graphql/types/dependency_proxy/image_ttl_group_policy_type.rb
   - app/graphql/types/dependency_proxy/manifest_type.rb
-  - app/graphql/types/design_management/design_collection_type.rb
-  - app/graphql/types/diff_refs_type.rb
-  - app/graphql/types/diff_stats_summary_type.rb
-  - app/graphql/types/diff_stats_type.rb
-  - app/graphql/types/error_tracking/sentry_detailed_error_type.rb
-  - app/graphql/types/error_tracking/sentry_error_collection_type.rb
-  - app/graphql/types/error_tracking/sentry_error_frequency_type.rb
-  - app/graphql/types/error_tracking/sentry_error_stack_trace_context_type.rb
-  - app/graphql/types/error_tracking/sentry_error_stack_trace_entry_type.rb
   - app/graphql/types/merge_request_type.rb
-  - app/graphql/types/metadata/kas_type.rb
-  - app/graphql/types/metadata_type.rb
-  - app/graphql/types/namespace/package_settings_type.rb
-  - app/graphql/types/namespace_type.rb
-  - app/graphql/types/notes/diff_position_type.rb
-  - app/graphql/types/notes/discussion_type.rb
-  - app/graphql/types/notes/note_type.rb
-  - app/graphql/types/packages/nuget/metadatum_type.rb
-  - app/graphql/types/packages/package_dependency_link_type.rb
-  - app/graphql/types/packages/package_file_type.rb
-  - app/graphql/types/packages/package_tag_type.rb
-  - app/graphql/types/packages/package_type.rb
   - app/graphql/types/project_statistics_type.rb
-  - app/graphql/types/project_type.rb
-  - app/graphql/types/projects/services/jira_project_type.rb
-  - app/graphql/types/release_asset_link_type.rb
-  - app/graphql/types/release_links_type.rb
   - app/graphql/types/release_type.rb
-  - app/graphql/types/repository_type.rb
   - app/graphql/types/root_storage_statistics_type.rb
-  - app/graphql/types/task_completion_status.rb
-  - app/graphql/types/tree/blob_type.rb
-  - ee/app/graphql/types/epic_type.rb
-  - ee/app/graphql/types/geo/geo_node_type.rb
-  - ee/app/graphql/types/requirements_management/requirement_states_count_type.rb
-  - ee/app/graphql/types/scan_execution_policy_type.rb
   - ee/app/graphql/types/scan_type.rb
-  - ee/app/graphql/types/scanned_resource_type.rb
-  - ee/app/graphql/types/security_report_summary_section_type.rb
   - ee/app/graphql/types/timebox_report_type.rb
diff --git a/.rubocop_todo/graphql/resolver_method_length.yml b/.rubocop_todo/graphql/resolver_method_length.yml
index 6fd8d41c548..e2183bb0894 100644
--- a/.rubocop_todo/graphql/resolver_method_length.yml
+++ b/.rubocop_todo/graphql/resolver_method_length.yml
@@ -3,5 +3,4 @@ GraphQL/ResolverMethodLength:
   Exclude:
   - app/graphql/types/ci/detailed_status_type.rb
   - app/graphql/types/ci/runner_type.rb
-  - app/graphql/types/ci/stage_type.rb
-  - app/graphql/types/packages/package_type.rb
+  - app/graphql/types/ci/stage_type.rb
\ No newline at end of file