Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

9 files changed, 51 insertions, 33 deletions

diff --git a/.rubocop_todo/rails/active_record_callbacks_order.yml b/.rubocop_todo/rails/active_record_callbacks_order.yml
index 9585a720c6a..11ffff36e8d 100644
--- a/.rubocop_todo/rails/active_record_callbacks_order.yml
+++ b/.rubocop_todo/rails/active_record_callbacks_order.yml
@@ -1,12 +1,9 @@
 ---
 # Cop supports --auto-correct.
 Rails/ActiveRecordCallbacksOrder:
-  # Offense count: 30
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/models/award_emoji.rb'
-    - 'app/models/ci/job_artifact.rb'
     - 'app/models/gpg_key.rb'
     - 'app/models/group.rb'
     - 'app/models/issue.rb'
diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml
index 467073eb2db..24a08fa5ee2 100644
--- a/.rubocop_todo/rails/file_path.yml
+++ b/.rubocop_todo/rails/file_path.yml
@@ -1,10 +1,7 @@
 ---
 Rails/FilePath:
-  # Offense count: 212
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
-    - 'app/controllers/clusters/clusters_controller.rb'
     - 'app/controllers/help_controller.rb'
     - 'app/helpers/startupjs_helper.rb'
     - 'app/models/clusters/applications/cert_manager.rb'
@@ -29,6 +26,7 @@ Rails/FilePath:
     - 'ee/db/fixtures/development/21_dast_profiles.rb'
     - 'ee/db/fixtures/development/32_compliance_report_violations.rb'
     - 'ee/lib/ee/feature/definition.rb'
+    - 'ee/lib/ee/gitlab/audit/type/definition.rb'
     - 'ee/lib/ee/gitlab/usage/metric_definition.rb'
     - 'ee/lib/gitlab/geo/health_check.rb'
     - 'ee/lib/tasks/gitlab/seed/metrics.rake'
@@ -48,6 +46,8 @@ Rails/FilePath:
     - 'lib/api/api.rb'
     - 'lib/error_tracking/collector/payload_validator.rb'
     - 'lib/feature/definition.rb'
+    - 'lib/gitlab/audit/type/definition.rb'
+    - 'lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator.rb'
     - 'lib/gitlab/ci/reports/codequality_reports.rb'
     - 'lib/gitlab/database/migrations/runner.rb'
     - 'lib/gitlab/favicon.rb'
@@ -69,14 +69,17 @@ Rails/FilePath:
     - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb'
     - 'lib/system_check/app/uploads_directory_exists_check.rb'
     - 'lib/system_check/incoming_email/imap_authentication_check.rb'
+    - 'lib/tasks/gitlab/db.rake'
     - 'lib/tasks/gitlab/metrics_exporter.rake'
+    - 'lib/tasks/gitlab/usage_data.rake'
     - 'lib/tasks/tanuki_emoji.rake'
     - 'metrics_server/metrics_server.rb'
     - 'spec/commands/metrics_server/metrics_server_spec.rb'
     - 'spec/config/object_store_settings_spec.rb'
-    - 'spec/controllers/help_controller_spec.rb'
+    - 'spec/db/development/add_security_training_providers_spec.rb'
     - 'spec/db/development/create_base_work_item_types_spec.rb'
     - 'spec/db/development/import_common_metrics_spec.rb'
+    - 'spec/db/production/add_security_training_providers_spec.rb'
     - 'spec/db/production/create_base_work_item_types_spec.rb'
     - 'spec/db/production/import_common_metrics_spec.rb'
     - 'spec/db/schema_spec.rb'
@@ -100,7 +103,6 @@ Rails/FilePath:
     - 'spec/features/projects/settings/repository_settings_spec.rb'
     - 'spec/features/projects/settings/user_changes_avatar_spec.rb'
     - 'spec/features/projects/snippets/create_snippet_spec.rb'
-    - 'spec/features/projects/tags/user_edits_tags_spec.rb'
     - 'spec/features/projects/tree/upload_file_spec.rb'
     - 'spec/features/snippets/user_creates_snippet_spec.rb'
     - 'spec/features/snippets/user_edits_snippet_spec.rb'
@@ -127,10 +129,12 @@ Rails/FilePath:
     - 'spec/models/clusters/applications/cert_manager_spec.rb'
     - 'spec/models/release_highlight_spec.rb'
     - 'spec/requests/api/internal/mail_room_spec.rb'
+    - 'spec/requests/api/usage_data_queries_spec.rb'
     - 'spec/serializers/review_app_setup_entity_spec.rb'
     - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
     - 'spec/services/clusters/aws/provision_service_spec.rb'
     - 'spec/services/metrics/sample_metrics_service_spec.rb'
+    - 'spec/support/helpers/doc_url_helper.rb'
     - 'spec/support/helpers/test_env.rb'
     - 'spec/support/helpers/upload_helpers.rb'
     - 'spec/support/shared_examples/features/project_upload_files_shared_examples.rb'
@@ -139,3 +143,4 @@ Rails/FilePath:
     - 'spec/support/shared_examples/models/wiki_shared_examples.rb'
     - 'spec/tasks/gitlab/db_rake_spec.rb'
     - 'spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb'
+    - 'spec/tasks/gitlab/usage_data_rake_spec.rb'
diff --git a/.rubocop_todo/rails/helper_instance_variable.yml b/.rubocop_todo/rails/helper_instance_variable.yml
index f43ca39f47c..8f9197c9223 100644
--- a/.rubocop_todo/rails/helper_instance_variable.yml
+++ b/.rubocop_todo/rails/helper_instance_variable.yml
@@ -1,8 +1,6 @@
 ---
 Rails/HelperInstanceVariable:
-  # Offense count: 671
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/helpers/admin/user_actions_helper.rb'
     - 'app/helpers/application_helper.rb'
@@ -29,7 +27,6 @@ Rails/HelperInstanceVariable:
     - 'app/helpers/icons_helper.rb'
     - 'app/helpers/ide_helper.rb'
     - 'app/helpers/import_helper.rb'
-    - 'app/helpers/integrations_helper.rb'
     - 'app/helpers/issuables_description_templates_helper.rb'
     - 'app/helpers/issuables_helper.rb'
     - 'app/helpers/issues_helper.rb'
@@ -40,6 +37,7 @@ Rails/HelperInstanceVariable:
     - 'app/helpers/nav_helper.rb'
     - 'app/helpers/notes_helper.rb'
     - 'app/helpers/operations_helper.rb'
+    - 'app/helpers/packages_helper.rb'
     - 'app/helpers/page_layout_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/releases_helper.rb'
@@ -59,11 +57,13 @@ Rails/HelperInstanceVariable:
     - 'app/helpers/webpack_helper.rb'
     - 'app/helpers/wiki_helper.rb'
     - 'ee/app/helpers/ee/application_helper.rb'
+    - 'ee/app/helpers/ee/application_settings_helper.rb'
     - 'ee/app/helpers/ee/boards_helper.rb'
     - 'ee/app/helpers/ee/feature_flags_helper.rb'
     - 'ee/app/helpers/ee/form_helper.rb'
     - 'ee/app/helpers/ee/graph_helper.rb'
     - 'ee/app/helpers/ee/groups/group_members_helper.rb'
+    - 'ee/app/helpers/ee/groups/settings_helper.rb'
     - 'ee/app/helpers/ee/groups_helper.rb'
     - 'ee/app/helpers/ee/integrations_helper.rb'
     - 'ee/app/helpers/ee/kerberos_helper.rb'
@@ -77,7 +77,8 @@ Rails/HelperInstanceVariable:
     - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/helpers/ee/search_helper.rb'
     - 'ee/app/helpers/ee/selects_helper.rb'
+    - 'ee/app/helpers/ee/sorting_helper.rb'
     - 'ee/app/helpers/ee/subscribable_banner_helper.rb'
     - 'ee/app/helpers/ee/wiki_helper.rb'
     - 'ee/app/helpers/path_locks_helper.rb'
-    - 'ee/app/helpers/projects/security/discover_helper.rb'
+    - 'ee/app/helpers/seat_count_alert_helper.rb'
diff --git a/.rubocop_todo/rails/http_status.yml b/.rubocop_todo/rails/http_status.yml
new file mode 100644
index 00000000000..1a8ece49304
--- /dev/null
+++ b/.rubocop_todo/rails/http_status.yml
@@ -0,0 +1,9 @@
+---
+# Cop supports --auto-correct.
+Rails/HttpStatus:
+  Exclude:
+    - 'app/controllers/concerns/invisible_captcha_on_signup.rb'
+    - 'app/controllers/projects/runner_projects_controller.rb'
+    - 'app/controllers/projects/service_ping_controller.rb'
+    - 'app/controllers/repositories/lfs_storage_controller.rb'
+    - 'ee/app/controllers/trials_controller.rb'
diff --git a/.rubocop_todo/rails/index_with.yml b/.rubocop_todo/rails/index_with.yml
index d8ccbd97f7c..91a75e198f5 100644
--- a/.rubocop_todo/rails/index_with.yml
+++ b/.rubocop_todo/rails/index_with.yml
@@ -1,29 +1,30 @@
 ---
 # Cop supports --auto-correct.
 Rails/IndexWith:
-  # Offense count: 54
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/helpers/ci/jobs_helper.rb'
     - 'app/models/ci/build_trace_chunk.rb'
     - 'app/models/ci/processable.rb'
     - 'app/models/concerns/cached_commit.rb'
+    - 'app/models/customer_relations/organization.rb'
     - 'app/models/environment.rb'
     - 'app/services/concerns/rate_limited_service.rb'
+    - 'app/services/packages/rpm/parse_package_service.rb'
     - 'db/post_migrate/20210731132939_backfill_stage_event_hash.rb'
+    - 'ee/app/models/concerns/identity_verifiable.rb'
     - 'ee/app/models/vulnerabilities/projects_grade.rb'
     - 'ee/lib/ee/gitlab/usage_data.rb'
     - 'ee/lib/gitlab/auth/group_saml/auth_hash.rb'
     - 'ee/lib/gitlab/custom_file_templates.rb'
     - 'ee/lib/gitlab/insights/reducers/count_per_label_reducer.rb'
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
-    - 'ee/spec/models/ee/namespace_spec.rb'
     - 'ee/spec/models/sca/license_compliance_spec.rb'
     - 'ee/spec/views/admin/dashboard/index.html.haml_spec.rb'
     - 'lib/api/entities/project_integration.rb'
     - 'lib/api/helpers/packages/conan/api_helpers.rb'
     - 'lib/banzai/filter/repository_link_filter.rb'
+    - 'lib/gitlab/background_migration/backfill_note_discussion_id.rb'
     - 'lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb'
     - 'lib/gitlab/ci/ansi2html.rb'
     - 'lib/gitlab/ci/reports/security/finding.rb'
@@ -32,10 +33,12 @@ Rails/IndexWith:
     - 'lib/gitlab/database/count/exact_count_strategy.rb'
     - 'lib/gitlab/database/migration_helpers.rb'
     - 'lib/gitlab/database/obsolete_ignored_columns.rb'
+    - 'lib/gitlab/database/tables_sorted_by_foreign_keys.rb'
     - 'lib/gitlab/issuable_metadata.rb'
     - 'lib/gitlab/template/base_template.rb'
     - 'lib/gitlab/usage_data.rb'
     - 'lib/google_api/cloud_platform/client.rb'
+    - 'lib/tasks/gitlab/db.rake'
     - 'qa/qa/resource/reusable.rb'
     - 'scripts/trigger-build.rb'
     - 'spec/lib/gitlab/api_authentication/sent_through_builder_spec.rb'
diff --git a/.rubocop_todo/rails/inverse_of.yml b/.rubocop_todo/rails/inverse_of.yml
index 98d116c3319..262804739bd 100644
--- a/.rubocop_todo/rails/inverse_of.yml
+++ b/.rubocop_todo/rails/inverse_of.yml
@@ -1,8 +1,6 @@
 ---
 Rails/InverseOf:
-  # Offense count: 210
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/models/alert_management/alert.rb'
     - 'app/models/alert_management/alert_assignee.rb'
@@ -12,7 +10,6 @@ Rails/InverseOf:
     - 'app/models/board.rb'
     - 'app/models/bulk_imports/entity.rb'
     - 'app/models/bulk_imports/tracker.rb'
-    - 'app/models/chat_name.rb'
     - 'app/models/ci/bridge.rb'
     - 'app/models/ci/build.rb'
     - 'app/models/ci/build_pending_state.rb'
@@ -25,7 +22,6 @@ Rails/InverseOf:
     - 'app/models/ci/runner.rb'
     - 'app/models/ci/runner_namespace.rb'
     - 'app/models/ci/sources/pipeline.rb'
-    - 'app/models/ci/stage.rb'
     - 'app/models/ci/trigger_request.rb'
     - 'app/models/ci/unit_test_failure.rb'
     - 'app/models/clusters/applications/runner.rb'
@@ -38,7 +34,6 @@ Rails/InverseOf:
     - 'app/models/concerns/analytics/cycle_analytics/stage.rb'
     - 'app/models/concerns/awardable.rb'
     - 'app/models/concerns/commit_signature.rb'
-    - 'app/models/concerns/merge_request_reviewer_state.rb'
     - 'app/models/concerns/with_uploads.rb'
     - 'app/models/custom_emoji.rb'
     - 'app/models/customer_relations/contact.rb'
@@ -51,7 +46,7 @@ Rails/InverseOf:
     - 'app/models/group.rb'
     - 'app/models/group/crm_settings.rb'
     - 'app/models/group_group_link.rb'
-    - 'app/models/hooks/service_hook.rb'
+    - 'app/models/group_label.rb'
     - 'app/models/incident_management/timeline_event.rb'
     - 'app/models/integrations/base_slash_commands.rb'
     - 'app/models/issue.rb'
@@ -66,11 +61,15 @@ Rails/InverseOf:
     - 'app/models/packages/composer/cache_file.rb'
     - 'app/models/packages/maven/metadatum.rb'
     - 'app/models/project.rb'
+    - 'app/models/project_label.rb'
     - 'app/models/resource_state_event.rb'
     - 'app/models/serverless/domain_cluster.rb'
     - 'app/models/terraform/state_version.rb'
+    - 'app/models/time_tracking/timelog_category.rb'
     - 'app/models/todo.rb'
     - 'app/models/user.rb'
+    - 'app/models/users/phone_number_validation.rb'
+    - 'app/models/work_item.rb'
     - 'app/models/x509_certificate.rb'
     - 'ee/app/models/allowed_email_domain.rb'
     - 'ee/app/models/analytics/cycle_analytics/group_stage.rb'
@@ -78,12 +77,14 @@ Rails/InverseOf:
     - 'ee/app/models/analytics/devops_adoption/enabled_namespace.rb'
     - 'ee/app/models/analytics/devops_adoption/snapshot.rb'
     - 'ee/app/models/audit_events/external_audit_event_destination.rb'
+    - 'ee/app/models/audit_events/streaming/header.rb'
     - 'ee/app/models/ci/sources/project.rb'
     - 'ee/app/models/compliance_management/compliance_framework/project_settings.rb'
     - 'ee/app/models/concerns/incident_management/base_pending_escalation.rb'
     - 'ee/app/models/dast/profile_schedule.rb'
     - 'ee/app/models/ee/ci/build.rb'
     - 'ee/app/models/ee/ci/pipeline.rb'
+    - 'ee/app/models/ee/clusters/agent.rb'
     - 'ee/app/models/ee/epic.rb'
     - 'ee/app/models/ee/group.rb'
     - 'ee/app/models/ee/iteration.rb'
@@ -105,9 +106,9 @@ Rails/InverseOf:
     - 'ee/app/models/integrations/gitlab_slack_application.rb'
     - 'ee/app/models/requirements_management/requirement.rb'
     - 'ee/app/models/requirements_management/test_report.rb'
+    - 'ee/app/models/sbom/vulnerable_component_version.rb'
     - 'ee/app/models/security/orchestration_policy_configuration.rb'
     - 'ee/app/models/security/orchestration_policy_rule_schedule.rb'
-    - 'ee/app/models/slack_integration.rb'
     - 'ee/app/models/software_license_policy.rb'
     - 'ee/app/models/user_permission_export_upload.rb'
     - 'ee/app/models/vulnerabilities/feedback.rb'
diff --git a/.rubocop_todo/rails/redundant_foreign_key.yml b/.rubocop_todo/rails/redundant_foreign_key.yml
index 7e394849670..22af6131b33 100644
--- a/.rubocop_todo/rails/redundant_foreign_key.yml
+++ b/.rubocop_todo/rails/redundant_foreign_key.yml
@@ -1,9 +1,7 @@
 ---
 # Cop supports --auto-correct.
 Rails/RedundantForeignKey:
-  # Offense count: 90
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/models/alert_management/metric_image.rb'
     - 'app/models/ci/build.rb'
@@ -23,9 +21,11 @@ Rails/RedundantForeignKey:
     - 'app/models/commit_signatures/x509_commit_signature.rb'
     - 'app/models/concerns/analytics/cycle_analytics/stage.rb'
     - 'app/models/concerns/commit_signature.rb'
+    - 'app/models/concerns/integrations/base_data_fields.rb'
     - 'app/models/group.rb'
     - 'app/models/group_group_link.rb'
-    - 'app/models/integrations/zentao_tracker_data.rb'
+    - 'app/models/incident_management/timeline_event.rb'
+    - 'app/models/issue.rb'
     - 'app/models/member.rb'
     - 'app/models/merge_request.rb'
     - 'app/models/merge_request/metrics.rb'
@@ -35,9 +35,13 @@ Rails/RedundantForeignKey:
     - 'app/models/project.rb'
     - 'app/models/resource_state_event.rb'
     - 'app/models/review.rb'
+    - 'app/models/time_tracking/timelog_category.rb'
     - 'app/models/user.rb'
+    - 'app/models/users/phone_number_validation.rb'
+    - 'app/models/work_item.rb'
     - 'app/models/x509_certificate.rb'
     - 'ee/app/models/allowed_email_domain.rb'
+    - 'ee/app/models/audit_events/streaming/header.rb'
     - 'ee/app/models/boards/epic_board.rb'
     - 'ee/app/models/boards/epic_list_user_preference.rb'
     - 'ee/app/models/ci/sources/project.rb'
diff --git a/.rubocop_todo/rails/skips_model_validations.yml b/.rubocop_todo/rails/skips_model_validations.yml
index 8ef895ed562..f5aa7411c89 100644
--- a/.rubocop_todo/rails/skips_model_validations.yml
+++ b/.rubocop_todo/rails/skips_model_validations.yml
@@ -252,7 +252,6 @@ Rails/SkipsModelValidations:
     - 'ee/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb'
     - 'ee/spec/controllers/groups/ldaps_controller_spec.rb'
     - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'
-    - 'ee/spec/controllers/trials_controller_spec.rb'
     - 'ee/spec/factories/import_states.rb'
     - 'ee/spec/features/admin/admin_settings_spec.rb'
     - 'ee/spec/features/epic_boards/epic_boards_sidebar_spec.rb'
diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml
index 8931b337ce1..f1e7d519a8f 100644
--- a/.rubocop_todo/rails/time_zone.yml
+++ b/.rubocop_todo/rails/time_zone.yml
@@ -19,7 +19,6 @@ Rails/TimeZone:
   - ee/spec/lib/gitlab/auth/ldap/access_spec.rb
   - ee/spec/lib/gitlab/auth/smartcard/san_extension_spec.rb
   - ee/spec/lib/gitlab/auth/smartcard/session_spec.rb
-  - ee/spec/lib/gitlab/ci/pipeline/chain/limit/job_activity_spec.rb
   - ee/spec/lib/gitlab/elastic/client_spec.rb
   - ee/spec/lib/gitlab/geo/base_request_spec.rb
   - ee/spec/lib/gitlab/geo/log_cursor/events/cache_invalidation_event_spec.rb