Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

8 files changed, 111 insertions, 24 deletions

diff --git a/.rubocop_todo/graphql/argument_uniqueness.yml b/.rubocop_todo/graphql/argument_uniqueness.yml
index 036d5d8ecdb..8a1fb31af62 100644
--- a/.rubocop_todo/graphql/argument_uniqueness.yml
+++ b/.rubocop_todo/graphql/argument_uniqueness.yml
@@ -1,4 +1,4 @@
 ---
 GraphQL/ArgumentUniqueness:
   Exclude:
-    - app/graphql/resolvers/merge_requests_resolver.rb
+    - 'app/graphql/resolvers/merge_requests_resolver.rb'
diff --git a/.rubocop_todo/graphql/descriptions.yml b/.rubocop_todo/graphql/descriptions.yml
new file mode 100644
index 00000000000..9d76d7d7638
--- /dev/null
+++ b/.rubocop_todo/graphql/descriptions.yml
@@ -0,0 +1,98 @@
+---
+# Cop supports --autocorrect.
+Graphql/Descriptions:
+  Safe: false
+  Details: grace period
+  Exclude:
+    - 'app/graphql/mutations/boards/lists/base_update.rb'
+    - 'app/graphql/mutations/ci/project_ci_cd_settings_update.rb'
+    - 'app/graphql/mutations/clusters/agents/create.rb'
+    - 'app/graphql/mutations/merge_requests/accept.rb'
+    - 'app/graphql/mutations/notes/create/note.rb'
+    - 'app/graphql/mutations/releases/create.rb'
+    - 'app/graphql/resolvers/admin/analytics/usage_trends/measurements_resolver.rb'
+    - 'app/graphql/resolvers/alert_management/alert_resolver.rb'
+    - 'app/graphql/resolvers/concerns/issues/sort_arguments.rb'
+    - 'app/graphql/resolvers/concerns/resolves_pipelines.rb'
+    - 'app/graphql/resolvers/container_repositories_resolver.rb'
+    - 'app/graphql/resolvers/design_management/design_at_version_resolver.rb'
+    - 'app/graphql/resolvers/group_packages_resolver.rb'
+    - 'app/graphql/resolvers/issues/base_parent_resolver.rb'
+    - 'app/graphql/resolvers/issues/base_resolver.rb'
+    - 'app/graphql/resolvers/issues_resolver.rb'
+    - 'app/graphql/resolvers/merge_requests_resolver.rb'
+    - 'app/graphql/resolvers/milestones_resolver.rb'
+    - 'app/graphql/resolvers/namespace_projects_resolver.rb'
+    - 'app/graphql/resolvers/packages_base_resolver.rb'
+    - 'app/graphql/resolvers/releases_resolver.rb'
+    - 'app/graphql/resolvers/users_resolver.rb'
+    - 'app/graphql/resolvers/work_items_resolver.rb'
+    - 'app/graphql/types/alert_management/alert_type.rb'
+    - 'app/graphql/types/award_emojis/award_emoji_type.rb'
+    - 'app/graphql/types/board_list_type.rb'
+    - 'app/graphql/types/branch_protections/base_access_level_type.rb'
+    - 'app/graphql/types/branch_rules/branch_protection_type.rb'
+    - 'app/graphql/types/ci/job_token_scope_type.rb'
+    - 'app/graphql/types/ci/pipeline_type.rb'
+    - 'app/graphql/types/ci/runner_status_enum.rb'
+    - 'app/graphql/types/ci/runner_type.rb'
+    - 'app/graphql/types/ci/runner_web_url_edge.rb'
+    - 'app/graphql/types/ci/status_action_type.rb'
+    - 'app/graphql/types/clusters/agent_token_type.rb'
+    - 'app/graphql/types/clusters/agent_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/deployment_tag_type.rb'
+    - 'app/graphql/types/design_management/design_at_version_type.rb'
+    - 'app/graphql/types/design_management/design_fields.rb'
+    - 'app/graphql/types/diff_stats_type.rb'
+    - 'app/graphql/types/event_type.rb'
+    - 'app/graphql/types/group_type.rb'
+    - 'app/graphql/types/issue_type.rb'
+    - 'app/graphql/types/issues/negated_issue_filter_input_type.rb'
+    - 'app/graphql/types/label_type.rb'
+    - 'app/graphql/types/merge_request_type.rb'
+    - 'app/graphql/types/merge_requests/interacts_with_merge_request.rb'
+    - 'app/graphql/types/milestone_sort_enum.rb'
+    - 'app/graphql/types/milestone_type.rb'
+    - 'app/graphql/types/namespace/package_settings_type.rb'
+    - 'app/graphql/types/notes/discussion_type.rb'
+    - 'app/graphql/types/notes/note_type.rb'
+    - 'app/graphql/types/notes/noteable_interface.rb'
+    - 'app/graphql/types/packages/cleanup/policy_type.rb'
+    - 'app/graphql/types/packages/package_details_type.rb'
+    - 'app/graphql/types/project_type.rb'
+    - 'app/graphql/types/projects/branch_rule_type.rb'
+    - 'app/graphql/types/release_links_type.rb'
+    - 'app/graphql/types/repository/blob_type.rb'
+    - 'app/graphql/types/snippet_type.rb'
+    - 'app/graphql/types/terraform/state_version_type.rb'
+    - 'app/graphql/types/todo_type.rb'
+    - 'app/graphql/types/todoable_interface.rb'
+    - 'app/graphql/types/user_interface.rb'
+    - 'app/graphql/types/user_merge_request_interaction_type.rb'
+    - '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/issue_type.rb'
+    - 'ee/app/graphql/ee/types/merge_request_type.rb'
+    - 'ee/app/graphql/ee/types/projects/branch_rule_type.rb'
+    - 'ee/app/graphql/ee/types/user_merge_request_interaction_type.rb'
+    - 'ee/app/graphql/resolvers/epics_resolver.rb'
+    - 'ee/app/graphql/types/access_levels/user_type.rb'
+    - 'ee/app/graphql/types/boards/epic_list_type.rb'
+    - 'ee/app/graphql/types/branch_rules/approval_project_rule_type.rb'
+    - 'ee/app/graphql/types/burnup_chart_daily_totals_type.rb'
+    - 'ee/app/graphql/types/ci/namespace_ci_cd_setting_type.rb'
+    - 'ee/app/graphql/types/compliance_management/compliance_framework_input_type.rb'
+    - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_input_type.rb'
+    - 'ee/app/graphql/types/epic_descendant_weight_sum_type.rb'
+    - 'ee/app/graphql/types/epic_type.rb'
+    - 'ee/app/graphql/types/geo/geo_node_type.rb'
+    - 'ee/app/graphql/types/iterations/cadence_type.rb'
+    - 'ee/app/graphql/types/network_policy_type.rb'
+    - 'ee/app/graphql/types/path_lock_type.rb'
+    - 'ee/app/graphql/types/security_orchestration/group_security_policy_source_type.rb'
+    - 'ee/app/graphql/types/security_orchestration/orchestration_policy_type.rb'
+    - 'ee/app/graphql/types/vulnerability_type.rb'
+    - 'ee/app/graphql/types/vulnerable_projects_by_grade_type.rb'
diff --git a/.rubocop_todo/graphql/field_definitions.yml b/.rubocop_todo/graphql/field_definitions.yml
index 0e2399ba243..fa230afc8d0 100644
--- a/.rubocop_todo/graphql/field_definitions.yml
+++ b/.rubocop_todo/graphql/field_definitions.yml
@@ -1,4 +1,5 @@
 ---
+# Cop supports --autocorrect.
 GraphQL/FieldDefinitions:
   Exclude:
-  - ee/app/graphql/types/vulnerability_type.rb
+    - 'ee/app/graphql/types/vulnerability_type.rb'
diff --git a/.rubocop_todo/graphql/field_hash_key.yml b/.rubocop_todo/graphql/field_hash_key.yml
index 806920e24f6..13460170c07 100644
--- a/.rubocop_todo/graphql/field_hash_key.yml
+++ b/.rubocop_todo/graphql/field_hash_key.yml
@@ -1,7 +1,5 @@
 ---
+# Cop supports --autocorrect.
 GraphQL/FieldHashKey:
   Exclude:
-  - app/graphql/types/ci/config/job_type.rb
-  - app/graphql/types/ci/status_action_type.rb
-  - app/graphql/types/error_tracking/sentry_error_stack_trace_entry_type.rb
-  - app/graphql/types/packages/helm/dependency_type.rb
+    - 'app/graphql/types/error_tracking/sentry_error_stack_trace_entry_type.rb'
diff --git a/.rubocop_todo/graphql/field_method.yml b/.rubocop_todo/graphql/field_method.yml
index 6a05b3c23b8..f9e9f46e7d6 100644
--- a/.rubocop_todo/graphql/field_method.yml
+++ b/.rubocop_todo/graphql/field_method.yml
@@ -1,4 +1,5 @@
 ---
+# Cop supports --autocorrect.
 GraphQL/FieldMethod:
   Exclude:
-  - app/graphql/types/packages/package_details_type.rb
+    - 'app/graphql/types/packages/package_details_type.rb'
diff --git a/.rubocop_todo/graphql/ordered_fields.yml b/.rubocop_todo/graphql/ordered_fields.yml
deleted file mode 100644
index b7135d7aabb..00000000000
--- a/.rubocop_todo/graphql/ordered_fields.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-GraphQL/OrderedFields:
-  Exclude:
-  - app/graphql/types/ci/runner_type.rb
-  - app/graphql/types/container_repository_type.rb
-  - app/graphql/types/dependency_proxy/manifest_type.rb
-  - app/graphql/types/merge_request_type.rb
-  - app/graphql/types/project_statistics_type.rb
-  - app/graphql/types/release_type.rb
-  - app/graphql/types/root_storage_statistics_type.rb
-  - ee/app/graphql/types/scan_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 e2183bb0894..f27246096a7 100644
--- a/.rubocop_todo/graphql/resolver_method_length.yml
+++ b/.rubocop_todo/graphql/resolver_method_length.yml
@@ -1,6 +1,6 @@
 ---
 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
\ No newline at end of file
+    - 'app/graphql/types/ci/detailed_status_type.rb'
+    - 'app/graphql/types/ci/runner_type.rb'
+    - 'app/graphql/types/ci/stage_type.rb'
diff --git a/.rubocop_todo/graphql/unused_argument.yml b/.rubocop_todo/graphql/unused_argument.yml
index c55d8551591..d03c6799471 100644
--- a/.rubocop_todo/graphql/unused_argument.yml
+++ b/.rubocop_todo/graphql/unused_argument.yml
@@ -1,5 +1,6 @@
 ---
+# Cop supports --autocorrect.
 GraphQL/UnusedArgument:
   Exclude:
-    - app/graphql/mutations/jira_import/start.rb
-    - app/graphql/resolvers/packages_base_resolver.rb
+    - 'app/graphql/mutations/jira_import/start.rb'
+    - 'app/graphql/resolvers/packages_base_resolver.rb'