Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

9 files changed, 133 insertions, 17 deletions

diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 79dfd85281c..5e9e80402b4 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -123,10 +123,8 @@ RSpec/ContextWording:
     - 'ee/spec/features/groups/push_rules_spec.rb'
     - 'ee/spec/features/groups/saml_enforcement_spec.rb'
     - 'ee/spec/features/groups/saml_providers_spec.rb'
-    - 'ee/spec/features/groups/seat_usage/seat_usage_spec.rb'
     - 'ee/spec/features/groups/security/compliance_dashboards_spec.rb'
     - 'ee/spec/features/groups/sso_spec.rb'
-    - 'ee/spec/features/groups/usage_quotas_spec.rb'
     - 'ee/spec/features/groups_spec.rb'
     - 'ee/spec/features/ide/user_commits_changes_spec.rb'
     - 'ee/spec/features/ide/user_opens_ide_spec.rb'
@@ -498,7 +496,6 @@ RSpec/ContextWording:
     - 'ee/spec/models/ee/audit_event_spec.rb'
     - 'ee/spec/models/ee/award_emoji_spec.rb'
     - 'ee/spec/models/ee/ci/job_artifact_spec.rb'
-    - 'ee/spec/models/ee/event_collection_spec.rb'
     - 'ee/spec/models/ee/event_spec.rb'
     - 'ee/spec/models/ee/group_group_link_spec.rb'
     - 'ee/spec/models/ee/group_spec.rb'
@@ -1361,7 +1358,6 @@ RSpec/ContextWording:
     - 'spec/features/projects/blobs/blob_show_spec.rb'
     - 'spec/features/projects/blobs/edit_spec.rb'
     - 'spec/features/projects/branches/user_views_branches_spec.rb'
-    - 'spec/features/projects/branches_spec.rb'
     - 'spec/features/projects/ci/lint_spec.rb'
     - 'spec/features/projects/clusters_spec.rb'
     - 'spec/features/projects/commit/comments/user_adds_comment_spec.rb'
@@ -1571,7 +1567,6 @@ RSpec/ContextWording:
     - 'spec/graphql/resolvers/group_milestones_resolver_spec.rb'
     - 'spec/graphql/resolvers/group_packages_resolver_spec.rb'
     - 'spec/graphql/resolvers/issue_status_counts_resolver_spec.rb'
-    - 'spec/graphql/resolvers/issues_resolver_spec.rb'
     - 'spec/graphql/resolvers/kas/agent_configurations_resolver_spec.rb'
     - 'spec/graphql/resolvers/kas/agent_connections_resolver_spec.rb'
     - 'spec/graphql/resolvers/last_commit_resolver_spec.rb'
@@ -2401,7 +2396,6 @@ RSpec/ContextWording:
     - 'spec/models/environment_spec.rb'
     - 'spec/models/environment_status_spec.rb'
     - 'spec/models/error_tracking/error_spec.rb'
-    - 'spec/models/event_collection_spec.rb'
     - 'spec/models/event_spec.rb'
     - 'spec/models/experiment_spec.rb'
     - 'spec/models/external_pull_request_spec.rb'
@@ -2777,7 +2771,6 @@ RSpec/ContextWording:
     - 'spec/routing/project_routing_spec.rb'
     - 'spec/rubocop/cop/gitlab/change_timezone_spec.rb'
     - 'spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb'
-    - 'spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb'
     - 'spec/rubocop/cop/gitlab/event_store_subscriber_spec.rb'
     - 'spec/rubocop/cop/gitlab/feature_available_usage_spec.rb'
     - 'spec/rubocop/cop/gitlab/mark_used_feature_flags_spec.rb'
@@ -2976,7 +2969,6 @@ RSpec/ContextWording:
     - 'spec/services/members/destroy_service_spec.rb'
     - 'spec/services/members/groups/creator_service_spec.rb'
     - 'spec/services/members/projects/creator_service_spec.rb'
-    - 'spec/services/members/update_service_spec.rb'
     - 'spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb'
     - 'spec/services/merge_requests/after_create_service_spec.rb'
     - 'spec/services/merge_requests/approval_service_spec.rb'
diff --git a/.rubocop_todo/rspec/empty_line_after_hook.yml b/.rubocop_todo/rspec/empty_line_after_hook.yml
index 4b1c4299b20..125055044de 100644
--- a/.rubocop_todo/rspec/empty_line_after_hook.yml
+++ b/.rubocop_todo/rspec/empty_line_after_hook.yml
@@ -4,7 +4,6 @@ RSpec/EmptyLineAfterHook:
   Exclude:
     - 'ee/spec/controllers/projects/integrations/zentao/issues_controller_spec.rb'
     - 'ee/spec/controllers/projects/push_rules_controller_spec.rb'
-    - 'ee/spec/features/groups/usage_quotas_spec.rb'
     - 'ee/spec/features/issues/user_bulk_edits_issues_spec.rb'
     - 'ee/spec/features/profiles/usage_quotas_spec.rb'
     - 'ee/spec/lib/ee/api/entities/user_with_admin_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
index 626ed1390ce..83892031a6c 100644
--- a/.rubocop_todo/rspec/expect_change.yml
+++ b/.rubocop_todo/rspec/expect_change.yml
@@ -293,7 +293,6 @@ RSpec/ExpectChange:
     - 'ee/spec/services/security/orchestration/assign_service_spec.rb'
     - 'ee/spec/services/security/override_uuids_service_spec.rb'
     - 'ee/spec/services/security/security_orchestration_policies/sync_opened_merge_requests_service_spec.rb'
-    - 'ee/spec/services/security/store_findings_metadata_service_spec.rb'
     - 'ee/spec/services/security/store_scan_service_spec.rb'
     - 'ee/spec/services/start_pull_mirroring_service_spec.rb'
     - 'ee/spec/services/status_page/mark_for_publication_service_spec.rb'
@@ -712,6 +711,7 @@ RSpec/ExpectChange:
     - 'spec/services/draft_notes/destroy_service_spec.rb'
     - 'spec/services/draft_notes/publish_service_spec.rb'
     - 'spec/services/emails/create_service_spec.rb'
+    - 'spec/services/environments/create_for_build_service_spec.rb'
     - 'spec/services/error_tracking/collect_error_service_spec.rb'
     - 'spec/services/error_tracking/list_projects_service_spec.rb'
     - 'spec/services/event_create_service_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 2da0040f8ed..b41233d83af 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -1,7 +1,27 @@
 ---
 RSpec/FactoryBot/AvoidCreate:
-  Details: grace period
   Exclude:
+    - 'ee/spec/presenters/approval_rule_presenter_spec.rb'
+    - 'ee/spec/presenters/audit_event_presenter_spec.rb'
+    - 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
+    - 'ee/spec/presenters/ci/minutes/usage_presenter_spec.rb'
+    - 'ee/spec/presenters/ci/pipeline_presenter_spec.rb'
+    - 'ee/spec/presenters/dast/site_profile_presenter_spec.rb'
+    - 'ee/spec/presenters/ee/blob_presenter_spec.rb'
+    - 'ee/spec/presenters/ee/clusters/cluster_presenter_spec.rb'
+    - 'ee/spec/presenters/ee/instance_clusterable_presenter_spec.rb'
+    - 'ee/spec/presenters/ee/issue_presenter_spec.rb'
+    - 'ee/spec/presenters/ee/projects/security/configuration_presenter_spec.rb'
+    - 'ee/spec/presenters/epic_issue_presenter_spec.rb'
+    - 'ee/spec/presenters/epic_presenter_spec.rb'
+    - 'ee/spec/presenters/group_clusterable_presenter_spec.rb'
+    - 'ee/spec/presenters/label_presenter_spec.rb'
+    - 'ee/spec/presenters/merge_request_approver_presenter_spec.rb'
+    - 'ee/spec/presenters/merge_request_presenter_spec.rb'
+    - 'ee/spec/presenters/project_clusterable_presenter_spec.rb'
+    - 'ee/spec/presenters/subscription_presenter_spec.rb'
+    - 'ee/spec/presenters/vulnerability_presenter_spec.rb'
+    - 'ee/spec/presenters/web_hooks/group/hook_presenter_spec.rb'
     - 'ee/spec/serializers/analytics/cycle_analytics/stage_entity_spec.rb'
     - 'ee/spec/serializers/analytics/cycle_analytics/value_stream_errors_serializer_spec.rb'
     - 'ee/spec/serializers/audit_event_entity_spec.rb'
@@ -11,7 +31,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/serializers/clusters/environment_entity_spec.rb'
     - 'ee/spec/serializers/clusters/environment_serializer_spec.rb'
     - 'ee/spec/serializers/dashboard_environment_entity_spec.rb'
-    - 'ee/spec/serializers/dashboard_environments_project_entity_spec.rb'
     - 'ee/spec/serializers/dashboard_environments_serializer_spec.rb'
     - 'ee/spec/serializers/dashboard_operations_project_entity_spec.rb'
     - 'ee/spec/serializers/dependency_entity_spec.rb'
@@ -73,6 +92,62 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/serializers/vulnerabilities/scanner_entity_spec.rb'
     - 'ee/spec/serializers/vulnerability_entity_spec.rb'
     - 'ee/spec/serializers/vulnerability_note_entity_spec.rb'
+    - 'spec/presenters/alert_management/alert_presenter_spec.rb'
+    - 'spec/presenters/blob_presenter_spec.rb'
+    - 'spec/presenters/blobs/notebook_presenter_spec.rb'
+    - 'spec/presenters/ci/bridge_presenter_spec.rb'
+    - 'spec/presenters/ci/build_presenter_spec.rb'
+    - 'spec/presenters/ci/build_runner_presenter_spec.rb'
+    - 'spec/presenters/ci/group_variable_presenter_spec.rb'
+    - 'spec/presenters/ci/pipeline_artifacts/code_coverage_presenter_spec.rb'
+    - 'spec/presenters/ci/pipeline_artifacts/code_quality_mr_diff_presenter_spec.rb'
+    - 'spec/presenters/ci/pipeline_presenter_spec.rb'
+    - 'spec/presenters/ci/stage_presenter_spec.rb'
+    - 'spec/presenters/ci/trigger_presenter_spec.rb'
+    - 'spec/presenters/ci/variable_presenter_spec.rb'
+    - 'spec/presenters/clusterable_presenter_spec.rb'
+    - 'spec/presenters/clusters/cluster_presenter_spec.rb'
+    - 'spec/presenters/commit_presenter_spec.rb'
+    - 'spec/presenters/commit_status_presenter_spec.rb'
+    - 'spec/presenters/deployments/deployment_presenter_spec.rb'
+    - 'spec/presenters/event_presenter_spec.rb'
+    - 'spec/presenters/gitlab/blame_presenter_spec.rb'
+    - 'spec/presenters/group_clusterable_presenter_spec.rb'
+    - 'spec/presenters/instance_clusterable_presenter_spec.rb'
+    - 'spec/presenters/issue_presenter_spec.rb'
+    - 'spec/presenters/label_presenter_spec.rb'
+    - 'spec/presenters/merge_request_presenter_spec.rb'
+    - 'spec/presenters/milestone_presenter_spec.rb'
+    - 'spec/presenters/packages/composer/packages_presenter_spec.rb'
+    - 'spec/presenters/packages/conan/package_presenter_spec.rb'
+    - 'spec/presenters/packages/detail/package_presenter_spec.rb'
+    - 'spec/presenters/packages/helm/index_presenter_spec.rb'
+    - 'spec/presenters/packages/npm/package_presenter_spec.rb'
+    - 'spec/presenters/packages/nuget/package_metadata_presenter_spec.rb'
+    - 'spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb'
+    - 'spec/presenters/packages/nuget/packages_versions_presenter_spec.rb'
+    - 'spec/presenters/packages/nuget/search_results_presenter_spec.rb'
+    - 'spec/presenters/packages/nuget/service_index_presenter_spec.rb'
+    - 'spec/presenters/packages/pypi/simple_index_presenter_spec.rb'
+    - 'spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb'
+    - 'spec/presenters/pages_domain_presenter_spec.rb'
+    - 'spec/presenters/project_clusterable_presenter_spec.rb'
+    - 'spec/presenters/project_hook_presenter_spec.rb'
+    - 'spec/presenters/project_presenter_spec.rb'
+    - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb'
+    - 'spec/presenters/projects/security/configuration_presenter_spec.rb'
+    - 'spec/presenters/projects/settings/deploy_keys_presenter_spec.rb'
+    - 'spec/presenters/prometheus_alert_presenter_spec.rb'
+    - 'spec/presenters/release_presenter_spec.rb'
+    - 'spec/presenters/releases/link_presenter_spec.rb'
+    - 'spec/presenters/search_service_presenter_spec.rb'
+    - 'spec/presenters/service_hook_presenter_spec.rb'
+    - 'spec/presenters/snippet_blob_presenter_spec.rb'
+    - 'spec/presenters/snippet_presenter_spec.rb'
+    - 'spec/presenters/terraform/modules_presenter_spec.rb'
+    - 'spec/presenters/tree_entry_presenter_spec.rb'
+    - 'spec/presenters/user_presenter_spec.rb'
+    - 'spec/presenters/web_hook_log_presenter_spec.rb'
     - 'spec/serializers/access_token_entity_base_spec.rb'
     - 'spec/serializers/analytics_build_entity_spec.rb'
     - 'spec/serializers/analytics_build_serializer_spec.rb'
@@ -192,7 +267,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/serializers/project_serializer_spec.rb'
     - 'spec/serializers/prometheus_alert_entity_spec.rb'
     - 'spec/serializers/release_serializer_spec.rb'
-    - 'spec/serializers/remote_mirror_entity_spec.rb'
     - 'spec/serializers/review_app_setup_entity_spec.rb'
     - 'spec/serializers/runner_entity_spec.rb'
     - 'spec/serializers/serverless/domain_entity_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml b/.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml
new file mode 100644
index 00000000000..456eca57804
--- /dev/null
+++ b/.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml
@@ -0,0 +1,54 @@
+---
+RSpec/FactoryBot/StrategyInCallback:
+  Details: grace period
+  Exclude:
+    - 'ee/spec/factories/ci/builds.rb'
+    - 'ee/spec/factories/ci/pipelines.rb'
+    - 'ee/spec/factories/dast_scanner_profiles.rb'
+    - 'ee/spec/factories/description_version.rb'
+    - 'ee/spec/factories/elastic/reindexing_tasks.rb'
+    - 'ee/spec/factories/epic_issues.rb'
+    - 'ee/spec/factories/geo/design_registry.rb'
+    - 'ee/spec/factories/geo_nodes.rb'
+    - 'ee/spec/factories/groups.rb'
+    - 'ee/spec/factories/merge_requests.rb'
+    - 'ee/spec/factories/namespaces.rb'
+    - 'ee/spec/factories/projects.rb'
+    - 'ee/spec/factories/protected_environments.rb'
+    - 'ee/spec/factories/users.rb'
+    - 'ee/spec/factories/vulnerabilities.rb'
+    - 'ee/spec/factories/vulnerabilities/external_issue_links.rb'
+    - 'ee/spec/factories/vulnerabilities/findings.rb'
+    - 'ee/spec/factories/vulnerabilities/issue_links.rb'
+    - 'ee/spec/factories/work_items.rb'
+    - 'spec/factories/alert_management/alerts.rb'
+    - 'spec/factories/ci/builds.rb'
+    - 'spec/factories/ci/pipelines.rb'
+    - 'spec/factories/ci/processable.rb'
+    - 'spec/factories/ci/runner_namespaces.rb'
+    - 'spec/factories/ci/runner_projects.rb'
+    - 'spec/factories/ci/runners.rb'
+    - 'spec/factories/clusters/clusters.rb'
+    - 'spec/factories/commits.rb'
+    - 'spec/factories/container_expiration_policies.rb'
+    - 'spec/factories/design_management/designs.rb'
+    - 'spec/factories/design_management/versions.rb'
+    - 'spec/factories/environments.rb'
+    - 'spec/factories/group_members.rb'
+    - 'spec/factories/groups.rb'
+    - 'spec/factories/integrations.rb'
+    - 'spec/factories/issues.rb'
+    - 'spec/factories/merge_requests.rb'
+    - 'spec/factories/ml/candidates.rb'
+    - 'spec/factories/namespaces.rb'
+    - 'spec/factories/packages/dependency_links.rb'
+    - 'spec/factories/packages/package_files.rb'
+    - 'spec/factories/packages/packages.rb'
+    - 'spec/factories/pool_repositories.rb'
+    - 'spec/factories/project_members.rb'
+    - 'spec/factories/projects.rb'
+    - 'spec/factories/releases.rb'
+    - 'spec/factories/resource_label_events.rb'
+    - 'spec/factories/terraform/state.rb'
+    - 'spec/factories/users.rb'
+    - 'spec/factories/work_items/parent_links.rb'
diff --git a/.rubocop_todo/rspec/file_path.yml b/.rubocop_todo/rspec/file_path.yml
index 3cf0e969c34..8930b709bfd 100644
--- a/.rubocop_todo/rspec/file_path.yml
+++ b/.rubocop_todo/rspec/file_path.yml
@@ -1,6 +1,5 @@
 ---
 RSpec/FilePath:
-  Details: grace period
   Exclude:
     - 'ee/spec/frontend/fixtures/analytics/charts.rb'
     - 'ee/spec/frontend/fixtures/analytics/devops_reports/devops_adoption/enabled_namespaces.rb'
@@ -65,3 +64,4 @@ RSpec/FilePath:
     - 'spec/services/ci/create_pipeline_service/rate_limit_spec.rb'
     - 'spec/services/ci/create_pipeline_service/rules_spec.rb'
     - 'spec/services/ci/create_pipeline_service/tags_spec.rb'
+    - 'spec/services/ci/create_pipeline_service/variables_spec.rb'
diff --git a/.rubocop_todo/rspec/multiple_memoized_helpers.yml b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
index 218ec3bb478..e939abd2886 100644
--- a/.rubocop_todo/rspec/multiple_memoized_helpers.yml
+++ b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
@@ -1,6 +1,5 @@
 ---
 RSpec/MultipleMemoizedHelpers:
-  Details: grace period
   Exclude:
     - 'ee/spec/features/boards/swimlanes/epics_swimlanes_filtering_spec.rb'
     - 'ee/spec/finders/epics_finder_spec.rb'
diff --git a/.rubocop_todo/rspec/scattered_let.yml b/.rubocop_todo/rspec/scattered_let.yml
index 61f1a09589f..9a272ec31cc 100644
--- a/.rubocop_todo/rspec/scattered_let.yml
+++ b/.rubocop_todo/rspec/scattered_let.yml
@@ -1,7 +1,6 @@
 ---
 # Cop supports --auto-correct.
 RSpec/ScatteredLet:
-  Details: grace period
   Exclude:
     - 'ee/spec/features/boards/user_visits_board_spec.rb'
     - 'ee/spec/features/groups/group_roadmap_spec.rb'
diff --git a/.rubocop_todo/rspec/timecop_travel.yml b/.rubocop_todo/rspec/timecop_travel.yml
index a8ca3a5fad5..3a9ebc443fd 100644
--- a/.rubocop_todo/rspec/timecop_travel.yml
+++ b/.rubocop_todo/rspec/timecop_travel.yml
@@ -1,5 +1,4 @@
 ---
 RSpec/TimecopTravel:
   Exclude:
-  - spec/workers/concerns/reenqueuer_spec.rb
   - qa/spec/support/repeater_spec.rb