Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 32 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 5d46979d563..4e22c8a85a4 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -524,7 +524,6 @@ Layout/ArgumentAlignment:
     - 'app/graphql/types/snippets/blob_connection_type.rb'
     - 'app/graphql/types/snippets/blob_type.rb'
     - 'app/graphql/types/sort_enum.rb'
-    - 'app/graphql/types/subscription_type.rb'
     - 'app/graphql/types/task_completion_status.rb'
     - 'app/graphql/types/terraform/state_type.rb'
     - 'app/graphql/types/terraform/state_version_type.rb'
@@ -791,10 +790,6 @@ Layout/ArgumentAlignment:
     - 'config/routes/unmatched_project.rb'
     - 'config/routes/uploads.rb'
     - 'config/routes/user.rb'
-    - 'db/migrate/20210604082145_create_external_status_checks_table.rb'
-    - 'db/migrate/20210609090856_add_expiry_id_ssh_key_notification_index.rb'
-    - 'db/migrate/20210709221051_create_work_item_types.rb'
-    - 'db/migrate/20210719182944_add_request_response_to_supporing_message.rb'
     - 'db/migrate/20210901065504_add_index_on_name_and_id_to_public_groups.rb'
     - 'db/migrate/20210910014741_add_dependency_proxy_ttl_group_policy_worker_capacity_to_application_settings.rb'
     - 'db/migrate/20211111112639_add_fk_compliance_violations_merge_request.rb'
@@ -864,17 +859,6 @@ Layout/ArgumentAlignment:
     - 'db/migrate/20230124193917_add_index_for_protected_tag_create_access_levels.rb'
     - 'db/migrate/20230127151529_add_project_pointer_for_analytics_dashboard.rb'
     - 'db/migrate/20230127151531_change_dashboard_analytics_project_pointer_project_null.rb'
-    - 'db/post_migrate/20210611080951_fix_missing_traversal_ids.rb'
-    - 'db/post_migrate/20210622045705_finalize_events_bigint_conversion.rb'
-    - 'db/post_migrate/20210701141346_finalize_ci_builds_stage_id_bigint_conversion.rb'
-    - 'db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb'
-    - 'db/post_migrate/20210708011426_finalize_ci_builds_metadata_bigint_conversion.rb'
-    - 'db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb'
-    - 'db/post_migrate/20210804151444_prepare_indexes_for_ci_job_artifact_bigint_conversion.rb'
-    - 'db/post_migrate/20210804153307_prepare_indexes_for_tagging_bigint_conversion.rb'
-    - 'db/post_migrate/20210804154407_prepare_indexes_for_ci_stage_bigint_conversion.rb'
-    - 'db/post_migrate/20210817024335_prepare_indexes_for_events_bigint_conversion.rb'
-    - 'db/post_migrate/20210824174615_prepare_ci_builds_metadata_and_ci_build_async_indexes.rb'
     - 'db/post_migrate/20210921062820_add_image_location_index_to_vulnerability_occurrences.rb'
     - 'db/post_migrate/20211007093340_remove_analytics_snapshots_segment_id_column.rb'
     - 'db/post_migrate/20211021140426_remove_geo_upload_deprecated_fields.rb'
@@ -1207,7 +1191,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/graphql/types/pipeline_security_report_finding_type.rb'
     - 'ee/app/graphql/types/product_analytics/dashboard_type.rb'
     - 'ee/app/graphql/types/product_analytics/visualization_type.rb'
-    - 'ee/app/graphql/types/product_analytics/widget_type.rb'
     - 'ee/app/graphql/types/protected_environment_type.rb'
     - 'ee/app/graphql/types/protected_environments/approval_rule_for_summary_type.rb'
     - 'ee/app/graphql/types/protected_environments/approval_rule_type.rb'
@@ -1343,7 +1326,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/services/security/track_scan_service.rb'
     - 'ee/app/services/vulnerabilities/confirm_service.rb'
     - 'ee/app/services/vulnerabilities/findings/find_or_create_from_security_finding_service.rb'
-    - 'ee/app/services/vulnerabilities/security_finding/create_issue_service.rb'
     - 'ee/app/services/vulnerabilities/security_finding/create_merge_request_service.rb'
     - 'ee/app/services/vulnerabilities/starboard_vulnerability_resolve_service.rb'
     - 'ee/app/services/vulnerability_feedback/create_service.rb'
@@ -1515,7 +1497,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/features/search/elastic/global_search_spec.rb'
     - 'ee/spec/features/search/elastic/group_search_spec.rb'
     - 'ee/spec/features/security/project/discover_spec.rb'
-    - 'ee/spec/features/trials/select_namespace_spec.rb'
     - 'ee/spec/features/uncompleted_learn_gitlab_link_spec.rb'
     - 'ee/spec/features/users/identity_verification_spec.rb'
     - 'ee/spec/finders/boards/milestones_finder_spec.rb'
@@ -1546,6 +1527,7 @@ Layout/ArgumentAlignment:
     - 'ee/spec/graphql/types/dast/pre_scan_verification_type_spec.rb'
     - 'ee/spec/graphql/types/dast/profile_type_spec.rb'
     - 'ee/spec/graphql/types/dast_scanner_profile_type_spec.rb'
+    - 'ee/spec/graphql/types/pipeline_security_report_finding_type_spec.rb'
     - 'ee/spec/graphql/types/project_type_spec.rb'
     - 'ee/spec/graphql/types/vulnerability_type_spec.rb'
     - 'ee/spec/helpers/billing_plans_helper_spec.rb'
@@ -1639,8 +1621,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/lib/incident_management/oncall_shift_generator_spec.rb'
     - 'ee/spec/lib/omni_auth/strategies/group_saml_spec.rb'
     - 'ee/spec/mailers/notify_spec.rb'
-    - 'ee/spec/migrations/add_non_null_constraint_for_escalation_rule_on_pending_alert_escalations_spec.rb'
-    - 'ee/spec/migrations/remove_schedule_and_status_null_constraints_from_pending_escalations_alert_spec.rb'
     - 'ee/spec/migrations/update_vulnerability_occurrences_location_spec.rb'
     - 'ee/spec/models/approval_wrapped_code_owner_rule_spec.rb'
     - 'ee/spec/models/ci/bridge_spec.rb'
@@ -1664,8 +1644,8 @@ Layout/ArgumentAlignment:
     - 'ee/spec/models/ee/event_spec.rb'
     - 'ee/spec/models/ee/group_spec.rb'
     - 'ee/spec/models/ee/namespace_spec.rb'
-    - 'ee/spec/models/ee/user_spec.rb'
     - 'ee/spec/models/ee/project_spec.rb'
+    - 'ee/spec/models/ee/user_spec.rb'
     - 'ee/spec/models/epic_spec.rb'
     - 'ee/spec/models/geo/project_registry_spec.rb'
     - 'ee/spec/models/ldap_group_link_spec.rb'
@@ -2051,7 +2031,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/ci/config/entry/root.rb'
     - 'lib/gitlab/ci/config/entry/rules/rule/changes.rb'
     - 'lib/gitlab/ci/config/extendable/entry.rb'
-    - 'lib/gitlab/ci/config/external/mapper/matcher.rb'
     - 'lib/gitlab/ci/lint.rb'
     - 'lib/gitlab/ci/status/stage/common.rb'
     - 'lib/gitlab/ci/trace/chunked_io.rb'
@@ -2660,7 +2639,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb'
     - 'spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb'
     - 'spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb'
-    - 'spec/lib/gitlab/database/tables_locker_spec.rb'
     - 'spec/lib/gitlab/database/tables_truncate_spec.rb'
     - 'spec/lib/gitlab/dependency_linker/parser/gemfile_spec.rb'
     - 'spec/lib/gitlab/diff/file_collection/compare_spec.rb'
@@ -2768,7 +2746,6 @@ Layout/ArgumentAlignment:
     - 'spec/mailers/emails/merge_requests_spec.rb'
     - 'spec/mailers/emails/pipelines_spec.rb'
     - 'spec/mailers/notify_spec.rb'
-    - 'spec/migrations/20210708130419_reschedule_merge_request_diff_users_background_migration_spec.rb'
     - 'spec/migrations/20210918201050_remove_old_pending_jobs_for_recalculate_vulnerabilities_occurrences_uuid_spec.rb'
     - 'spec/migrations/20211110151350_schedule_drop_invalid_security_findings_spec.rb'
     - 'spec/migrations/20211116111644_schedule_remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings_spec.rb'
@@ -2795,9 +2772,6 @@ Layout/ArgumentAlignment:
     - 'spec/migrations/cleanup_backfill_integrations_enable_ssl_verification_spec.rb'
     - 'spec/migrations/cleanup_vulnerability_state_transitions_with_same_from_state_to_state_spec.rb'
     - 'spec/migrations/delete_migrate_shared_vulnerability_scanners_spec.rb'
-    - 'spec/migrations/migrate_protected_attribute_to_pending_builds_spec.rb'
-    - 'spec/migrations/re_schedule_latest_pipeline_id_population_with_all_security_related_artifact_types_spec.rb'
-    - 'spec/migrations/reschedule_delete_orphaned_deployments_spec.rb'
     - 'spec/migrations/schedule_backfill_draft_status_on_merge_requests_corrected_regex_spec.rb'
     - 'spec/migrations/schedule_fixing_security_scan_statuses_spec.rb'
     - 'spec/migrations/schedule_purging_stale_security_scans_spec.rb'
@@ -3168,7 +3142,6 @@ Layout/ArgumentAlignment:
     - 'spec/services/task_list_toggle_service_spec.rb'
     - 'spec/services/todo_service_spec.rb'
     - 'spec/services/users/activity_service_spec.rb'
-    - 'spec/services/users/assigned_issues_count_service_spec.rb'
     - 'spec/services/users/destroy_service_spec.rb'
     - 'spec/services/users/migrate_records_to_ghost_user_in_batches_service_spec.rb'
     - 'spec/services/users/migrate_records_to_ghost_user_service_spec.rb'
@@ -3181,7 +3154,6 @@ Layout/ArgumentAlignment:
     - 'spec/support/helpers/api_internal_base_helpers.rb'
     - 'spec/support/helpers/board_helpers.rb'
     - 'spec/support/helpers/ci/source_pipeline_helpers.rb'
-    - 'spec/support/helpers/ci/template_helpers.rb'
     - 'spec/support/helpers/feature_flag_helpers.rb'
     - 'spec/support/helpers/graphql_helpers.rb'
     - 'spec/support/helpers/stub_object_storage.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 0a4ea883cbe..6f4f9ed61b8 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -235,7 +235,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/views/projects/security/sast_configuration/show.html.haml_spec.rb'
     - 'ee/spec/views/projects/settings/subscriptions/_index.html.haml_spec.rb'
     - 'ee/spec/views/registrations/groups_projects/new.html.haml_spec.rb'
-    - 'ee/spec/views/registrations/welcome/continuous_onboarding_getting_started.html.haml_spec.rb'
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/search/_category.html.haml_spec.rb'
     - 'ee/spec/views/shared/_clone_panel.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 32a479a4ba5..91b2fb06070 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -2420,7 +2420,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/views/projects/settings/subscriptions/_index.html.haml_spec.rb'
     - 'ee/spec/views/registrations/company/new.html.haml_spec.rb'
     - 'ee/spec/views/registrations/groups_projects/new.html.haml_spec.rb'
-    - 'ee/spec/views/registrations/welcome/continuous_onboarding_getting_started.html.haml_spec.rb'
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/shared/_clone_panel.html.haml_spec.rb'
     - 'ee/spec/views/shared/_kerberos_clone_button.html.haml_spec.rb'