Add latest changes from gitlab-org/gitlab@master

1 files changed, 104 insertions, 67 deletions

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index 1436ec9e484..fbb4e7d5cc8 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -29,6 +29,110 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/uploads.rb'
     - 'spec/factories/wiki_pages.rb'
 
+InternalAffairs/DeprecateCopHelper:
+  Exclude:
+    - 'spec/rubocop/code_reuse_helpers_spec.rb'
+    - 'spec/rubocop/qa_helpers_spec.rb'
+    - 'spec/rubocop/migration_helpers_spec.rb'
+    - 'spec/rubocop/cop/group_public_or_visible_to_user_spec.rb'
+    - 'spec/rubocop/cop/static_translation_definition_spec.rb'
+    - 'spec/rubocop/cop/lint/last_keyword_argument_spec.rb'
+    - 'spec/rubocop/cop/usage_data/large_table_spec.rb'
+    - 'spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb'
+    - 'spec/rubocop/cop/filename_length_spec.rb'
+    - 'spec/rubocop/cop/put_project_routes_under_scope_spec.rb'
+    - 'spec/rubocop/cop/gitlab/rails_logger_spec.rb'
+    - 'spec/rubocop/cop/gitlab/module_with_instance_variables_spec.rb'
+    - 'spec/rubocop/cop/gitlab/avoid_uploaded_file_from_params_spec.rb'
+    - 'spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb'
+    - 'spec/rubocop/cop/gitlab/bulk_insert_spec.rb'
+    - 'spec/rubocop/cop/gitlab/intersect_spec.rb'
+    - 'spec/rubocop/cop/gitlab/json_spec.rb'
+    - 'spec/rubocop/cop/gitlab/httparty_spec.rb'
+    - 'spec/rubocop/cop/gitlab/policy_rule_boolean_spec.rb'
+    - 'spec/rubocop/cop/gitlab/except_spec.rb'
+    - 'spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb'
+    - 'spec/rubocop/cop/gitlab/change_timezone_spec.rb'
+    - 'spec/rubocop/cop/gitlab/predicate_memoization_spec.rb'
+    - 'spec/rubocop/cop/gitlab/union_spec.rb'
+    - 'spec/rubocop/cop/gitlab/finder_with_find_by_spec.rb'
+    - 'spec/rubocop/cop/ruby_interpolation_in_translation_spec.rb'
+    - 'spec/rubocop/cop/active_record_association_reload_spec.rb'
+    - 'spec/rubocop/cop/ban_catch_throw_spec.rb'
+    - 'spec/rubocop/cop/avoid_break_from_strong_memoize_spec.rb'
+    - 'spec/rubocop/cop/avoid_becomes_spec.rb'
+    - 'spec/rubocop/cop/qa/ambiguous_page_object_name_spec.rb'
+    - 'spec/rubocop/cop/qa/element_with_pattern_spec.rb'
+    - 'spec/rubocop/cop/inject_enterprise_edition_module_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/finder_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/worker_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/service_class_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/presenter_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/serializer_spec.rb'
+    - 'spec/rubocop/cop/avoid_keyword_arguments_in_sidekiq_workers_spec.rb'
+    - 'spec/rubocop/cop/default_scope_spec.rb'
+    - 'spec/rubocop/cop/graphql/resolver_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/descriptions_spec.rb'
+    - 'spec/rubocop/cop/graphql/json_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/gid_expected_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/authorize_types_spec.rb'
+    - 'spec/rubocop/cop/graphql/id_type_spec.rb'
+    - 'spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb'
+    - 'spec/rubocop/cop/scalability/idempotent_worker_spec.rb'
+    - 'spec/rubocop/cop/scalability/cron_worker_context_spec.rb'
+    - 'spec/rubocop/cop/scalability/file_uploads_spec.rb'
+    - 'spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb'
+    - 'spec/rubocop/cop/api/base_spec.rb'
+    - 'spec/rubocop/cop/destroy_all_spec.rb'
+    - 'spec/rubocop/cop/safe_params_spec.rb'
+    - 'spec/rubocop/cop/include_sidekiq_worker_spec.rb'
+    - 'spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb'
+    - 'spec/rubocop/cop/rspec/timecop_freeze_spec.rb'
+    - 'spec/rubocop/cop/rspec/any_instance_of_spec.rb'
+    - 'spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb'
+    - 'spec/rubocop/cop/rspec/top_level_describe_path_spec.rb'
+    - 'spec/rubocop/cop/rspec/be_success_matcher_spec.rb'
+    - 'spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb'
+    - 'spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb'
+    - 'spec/rubocop/cop/rspec/expect_gitlab_tracking_spec.rb'
+    - 'spec/rubocop/cop/rspec/have_gitlab_http_status_spec.rb'
+    - 'spec/rubocop/cop/rspec/timecop_travel_spec.rb'
+    - 'spec/rubocop/cop/rspec/env_assignment_spec.rb'
+    - 'spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb'
+    - 'spec/rubocop/cop/performance/ar_count_each_spec.rb'
+    - 'spec/rubocop/cop/performance/readlines_each_spec.rb'
+    - 'spec/rubocop/cop/project_path_helper_spec.rb'
+    - 'spec/rubocop/cop/migration/safer_boolean_column_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_index_spec.rb'
+    - 'spec/rubocop/cop/migration/add_index_spec.rb'
+    - 'spec/rubocop/cop/migration/drop_table_spec.rb'
+    - 'spec/rubocop/cop/migration/hash_index_spec.rb'
+    - 'spec/rubocop/cop/migration/datetime_spec.rb'
+    - 'spec/rubocop/cop/migration/add_column_with_default_spec.rb'
+    - 'spec/rubocop/cop/migration/prevent_strings_spec.rb'
+    - 'spec/rubocop/cop/migration/add_timestamps_spec.rb'
+    - 'spec/rubocop/cop/migration/add_concurrent_index_spec.rb'
+    - 'spec/rubocop/cop/migration/update_column_in_batches_spec.rb'
+    - 'spec/rubocop/cop/migration/complex_indexes_require_name_spec.rb'
+    - 'spec/rubocop/cop/migration/refer_to_index_by_name_spec.rb'
+    - 'spec/rubocop/cop/migration/schedule_async_spec.rb'
+    - 'spec/rubocop/cop/migration/timestamps_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_concurrent_index_spec.rb'
+    - 'spec/rubocop/cop/migration/add_columns_to_wide_tables_spec.rb'
+    - 'spec/rubocop/cop/migration/with_lock_retries_disallowed_method_spec.rb'
+    - 'spec/rubocop/cop/migration/add_reference_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_column_spec.rb'
+    - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb'
+    - 'spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb'
+    - 'spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb'
+    - 'spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb'
+    - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'
+    - 'spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb'
+    - 'spec/rubocop/cop/put_group_routes_under_scope_spec.rb'
+    - 'spec/rubocop/cop/sidekiq_options_queue_spec.rb'
+    - 'spec/rubocop/cop/ignored_columns_spec.rb'
+    - 'spec/rubocop/cop/prefer_class_methods_over_module_spec.rb'
+
 Rails/SaveBang:
   Exclude:
     - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'
@@ -662,73 +766,6 @@ RSpec/TimecopTravel:
 
 Graphql/Descriptions:
   Exclude:
-    - 'app/graphql/mutations/admin/sidekiq_queues/delete_jobs.rb'
-    - 'app/graphql/mutations/alert_management/base.rb'
-    - 'app/graphql/mutations/alert_management/http_integration/create.rb'
-    - 'app/graphql/mutations/alert_management/http_integration/destroy.rb'
-    - 'app/graphql/mutations/alert_management/http_integration/http_integration_base.rb'
-    - 'app/graphql/mutations/alert_management/http_integration/reset_token.rb'
-    - 'app/graphql/mutations/alert_management/http_integration/update.rb'
-    - 'app/graphql/mutations/alert_management/prometheus_integration/create.rb'
-    - 'app/graphql/mutations/alert_management/prometheus_integration/prometheus_integration_base.rb'
-    - 'app/graphql/mutations/alert_management/prometheus_integration/reset_token.rb'
-    - 'app/graphql/mutations/alert_management/prometheus_integration/update.rb'
-    - 'app/graphql/mutations/alert_management/update_alert_status.rb'
-    - 'app/graphql/mutations/award_emojis/base.rb'
-    - 'app/graphql/mutations/boards/destroy.rb'
-    - 'app/graphql/mutations/boards/issues/issue_move_list.rb'
-    - 'app/graphql/mutations/boards/lists/base.rb'
-    - 'app/graphql/mutations/boards/lists/create.rb'
-    - 'app/graphql/mutations/boards/lists/update.rb'
-    - 'app/graphql/mutations/branches/create.rb'
-    - 'app/graphql/mutations/ci/base.rb'
-    - 'app/graphql/mutations/ci/pipeline_retry.rb'
-    - 'app/graphql/mutations/commits/create.rb'
-    - 'app/graphql/mutations/concerns/mutations/resolves_resource_parent.rb'
-    - 'app/graphql/mutations/concerns/mutations/resolves_subscription.rb'
-    - 'app/graphql/mutations/concerns/mutations/spammable_mutation_fields.rb'
-    - 'app/graphql/mutations/container_expiration_policies/update.rb'
-    - 'app/graphql/mutations/container_repositories/destroy_tags.rb'
-    - 'app/graphql/mutations/custom_emoji/create.rb'
-    - 'app/graphql/mutations/design_management/base.rb'
-    - 'app/graphql/mutations/design_management/delete.rb'
-    - 'app/graphql/mutations/design_management/move.rb'
-    - 'app/graphql/mutations/design_management/upload.rb'
-    - 'app/graphql/mutations/discussions/toggle_resolve.rb'
-    - 'app/graphql/mutations/environments/canary_ingress/update.rb'
-    - 'app/graphql/mutations/issues/base.rb'
-    - 'app/graphql/mutations/issues/create.rb'
-    - 'app/graphql/mutations/issues/move.rb'
-    - 'app/graphql/mutations/issues/set_due_date.rb'
-    - 'app/graphql/mutations/issues/set_locked.rb'
-    - 'app/graphql/mutations/issues/update.rb'
-    - 'app/graphql/mutations/jira_import/import_users.rb'
-    - 'app/graphql/mutations/jira_import/start.rb'
-    - 'app/graphql/mutations/labels/create.rb'
-    - 'app/graphql/mutations/merge_requests/base.rb'
-    - 'app/graphql/mutations/merge_requests/create.rb'
-    - 'app/graphql/mutations/metrics/dashboard/annotations/create.rb'
-    - 'app/graphql/mutations/metrics/dashboard/annotations/delete.rb'
-    - 'app/graphql/mutations/notes/base.rb'
-    - 'app/graphql/mutations/notes/create/base.rb'
-    - 'app/graphql/mutations/notes/create/note.rb'
-    - 'app/graphql/mutations/notes/destroy.rb'
-    - 'app/graphql/mutations/notes/reposition_image_diff_note.rb'
-    - 'app/graphql/mutations/notes/update/base.rb'
-    - 'app/graphql/mutations/releases/base.rb'
-    - 'app/graphql/mutations/releases/create.rb'
-    - 'app/graphql/mutations/releases/update.rb'
-    - 'app/graphql/mutations/snippets/base.rb'
-    - 'app/graphql/mutations/snippets/create.rb'
-    - 'app/graphql/mutations/snippets/destroy.rb'
-    - 'app/graphql/mutations/snippets/mark_as_spam.rb'
-    - 'app/graphql/mutations/snippets/update.rb'
-    - 'app/graphql/mutations/terraform/state/base.rb'
-    - 'app/graphql/mutations/todos/create.rb'
-    - 'app/graphql/mutations/todos/mark_all_done.rb'
-    - 'app/graphql/mutations/todos/mark_done.rb'
-    - 'app/graphql/mutations/todos/restore.rb'
-    - 'app/graphql/mutations/todos/restore_many.rb'
     - 'app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb'
     - 'app/graphql/resolvers/alert_management/alert_resolver.rb'
     - 'app/graphql/resolvers/alert_management/alert_status_counts_resolver.rb'