Add latest changes from gitlab-org/gitlab@master

tedyage · Jul 6, 2022 · 5d3eac1 · 5d3eac1
1 parent 9dadb12
commit 5d3eac1
Show file tree

Hide file tree

Showing 76 changed files with 619 additions and 346 deletions.
diff --git a/.rubocop_todo/database/rescue_query_canceled.yml b/.rubocop_todo/database/rescue_query_canceled.yml
@@ -0,0 +1,9 @@
+---
+Database/RescueQueryCanceled:
+  Exclude:
+    - 'app/services/issues/relative_position_rebalancing_service.rb'
+    - 'ee/app/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker.rb'
+    - 'lib/gitlab/background_migration/backfill_work_item_type_id_for_issues.rb'
+    - 'lib/gitlab/database/batch_counter.rb'
+    - 'lib/gitlab/issuables_count_for_state.rb'
+    - 'lib/tasks/gitlab/db/lock_writes.rake'
diff --git a/.rubocop_todo/database/rescue_statement_timeout.yml b/.rubocop_todo/database/rescue_statement_timeout.yml
@@ -0,0 +1,5 @@
+---
+Database/RescueStatementTimeout:
+  Exclude:
+    - 'app/services/issues/relative_position_rebalancing_service.rb'
+    - 'lib/gitlab/background_migration/backfill_work_item_type_id_for_issues.rb'
diff --git a/.rubocop_todo/gitlab/feature_available_usage.yml b/.rubocop_todo/gitlab/feature_available_usage.yml
@@ -128,14 +128,6 @@ Gitlab/FeatureAvailableUsage:
   - ee/app/views/projects/blob/_header_file_locks.html.haml
   - ee/app/views/projects/issues/_related_issues.html.haml
   - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
-  - ee/app/views/projects/merge_requests/show.html.haml
   - ee/app/views/projects/pipelines/_tabs_content.html.haml
   - ee/app/views/projects/protected_branches/ee/_code_owner_approval_form.html.haml
   - ee/app/views/projects/protected_branches/ee/_code_owner_approval_table.html.haml
@@ -153,12 +145,6 @@ Gitlab/FeatureAvailableUsage:
   - ee/app/views/shared/issuable/form/_default_templates.html.haml
   - ee/app/views/shared/labels/_create_label_help_text.html.haml
   - ee/app/views/shared/promotions/_promote_mr_features.html.haml
-  - ee/app/views/shared/promotions/_promote_mr_features.html.haml
-  - ee/app/views/shared/promotions/_promote_repository_features.html.haml
-  - ee/app/views/shared/promotions/_promote_repository_features.html.haml
-  - ee/app/views/shared/promotions/_promote_repository_features.html.haml
-  - ee/app/views/shared/promotions/_promote_repository_features.html.haml
-  - ee/app/views/shared/promotions/_promote_repository_features.html.haml
   - ee/app/views/shared/promotions/_promote_repository_features.html.haml
   - ee/app/workers/analytics/code_review_metrics_worker.rb
   - ee/app/workers/group_saml_group_sync_worker.rb

diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -766,7 +766,6 @@ Gitlab/NamespacedClass:
     - 'app/workers/emails_on_push_worker.rb'
     - 'app/workers/error_tracking_issue_link_worker.rb'
     - 'app/workers/expire_build_artifacts_worker.rb'
-    - 'app/workers/expire_job_cache_worker.rb'
     - 'app/workers/export_csv_worker.rb'
     - 'app/workers/external_service_reactive_caching_worker.rb'
     - 'app/workers/file_hook_worker.rb'
@@ -782,8 +781,6 @@ Gitlab/NamespacedClass:
     - 'app/workers/invalid_gpg_signature_update_worker.rb'
     - 'app/workers/issuable_export_csv_worker.rb'
     - 'app/workers/issue_due_scheduler_worker.rb'
-    - 'app/workers/issue_placement_worker.rb'
-    - 'app/workers/issue_rebalancing_worker.rb'
     - 'app/workers/member_invitation_reminder_emails_worker.rb'
     - 'app/workers/merge_request_cleanup_refs_worker.rb'
     - 'app/workers/merge_request_mergeability_check_worker.rb'
@@ -828,7 +825,6 @@ Gitlab/NamespacedClass:
     - 'app/workers/repository_cleanup_worker.rb'
     - 'app/workers/repository_fork_worker.rb'
     - 'app/workers/repository_import_worker.rb'
-    - 'app/workers/repository_remove_remote_worker.rb'
     - 'app/workers/repository_update_remote_mirror_worker.rb'
     - 'app/workers/run_pipeline_schedule_worker.rb'
     - 'app/workers/schedule_merge_request_cleanup_refs_worker.rb'
@@ -1012,7 +1008,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/serializers/group_analytics_serializer.rb'
     - 'ee/app/serializers/group_vulnerability_autocomplete_entity.rb'
     - 'ee/app/serializers/group_vulnerability_autocomplete_serializer.rb'
-    - 'ee/app/serializers/invited_group_serializer.rb'
     - 'ee/app/serializers/iteration_serializer.rb'
     - 'ee/app/serializers/license_entity.rb'
     - 'ee/app/serializers/license_scanning_reports_serializer.rb'
@@ -1051,7 +1046,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/workers/admin_emails_worker.rb'
     - 'ee/app/workers/clear_shared_runners_minutes_worker.rb'
     - 'ee/app/workers/create_github_webhook_worker.rb'
-    - 'ee/app/workers/dast_site_validation_worker.rb'
     - 'ee/app/workers/elastic_association_indexer_worker.rb'
     - 'ee/app/workers/elastic_cluster_reindexing_cron_worker.rb'
     - 'ee/app/workers/elastic_commit_indexer_worker.rb'
@@ -1093,7 +1087,6 @@ Gitlab/NamespacedClass:
     - 'ee/lib/gitlab/group_plans_preloader.rb'
     - 'ee/lib/gitlab/ip_address_state.rb'
     - 'ee/lib/gitlab/items_collection.rb'
-    - 'ee/lib/gitlab/manual_banner.rb'
     - 'ee/lib/gitlab/manual_quarterly_co_term_banner.rb'
     - 'ee/lib/gitlab/pagination_delegate.rb'
     - 'ee/lib/gitlab/path_locks_finder.rb'

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
@@ -397,7 +397,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/graphql/mutations/requirements_management/export_requirements_spec.rb'
     - 'ee/spec/helpers/billing_plans_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
-    - 'ee/spec/helpers/projects/security/policies_helper_spec.rb'
     - 'ee/spec/helpers/routing/pseudonymization_helper_spec.rb'
     - 'ee/spec/helpers/trial_status_widget_helper_spec.rb'
     - 'ee/spec/lib/analytics/group_activity_calculator_spec.rb'
@@ -475,7 +474,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/geo/file_registry_removal_service_spec.rb'
     - 'ee/spec/services/geo/repository_verification_primary_service_spec.rb'
-    - 'ee/spec/services/groups/recent_merge_requests_count_service_spec.rb'
     - 'ee/spec/services/merge_requests/reset_approvals_service_spec.rb'
     - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb'
     - 'ee/spec/services/namespaces/check_storage_size_service_spec.rb'
@@ -536,7 +534,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/background_migration/backfill_project_repositories.rb'
     - 'lib/gitlab/background_migration/batching_strategies/base_strategy.rb'
     - 'lib/gitlab/background_migration/legacy_upload_mover.rb'
-    - 'lib/gitlab/background_migration/migrate_stage_status.rb'
     - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb'
     - 'lib/gitlab/ci/config/entry/artifacts.rb'
     - 'lib/gitlab/ci/config/entry/bridge.rb'
@@ -570,7 +567,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/database_importers/instance_administrators/create_group.rb'
     - 'lib/gitlab/database_importers/self_monitoring/project/create_service.rb'
     - 'lib/gitlab/database_importers/self_monitoring/project/delete_service.rb'
-    - 'lib/gitlab/diff/custom_diff.rb'
     - 'lib/gitlab/diff/file.rb'
     - 'lib/gitlab/diff/file_collection/base.rb'
     - 'lib/gitlab/diff/suggestion.rb'
@@ -633,7 +629,6 @@ Layout/ArgumentAlignment:
     - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb'
     - 'spec/controllers/projects/pipelines/tests_controller_spec.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
-    - 'spec/controllers/projects/serverless/functions_controller_spec.rb'
     - 'spec/controllers/projects/settings/operations_controller_spec.rb'
     - 'spec/controllers/projects/tags_controller_spec.rb'
     - 'spec/controllers/projects/todos_controller_spec.rb'
@@ -674,7 +669,6 @@ Layout/ArgumentAlignment:
     - 'spec/features/projects/milestones/milestones_sorting_spec.rb'
     - 'spec/features/projects/pipelines/pipeline_spec.rb'
     - 'spec/features/projects/pipelines/pipelines_spec.rb'
-    - 'spec/features/projects/serverless/functions_spec.rb'
     - 'spec/features/refactor_blob_viewer_disabled/projects/files/editing_a_file_spec.rb'
     - 'spec/features/refactor_blob_viewer_disabled/projects/files/project_owner_creates_license_file_spec.rb'
     - 'spec/finders/ci/commit_statuses_finder_spec.rb'
@@ -897,7 +891,6 @@ Layout/ArgumentAlignment:
     - 'spec/services/namespaces/package_settings/update_service_spec.rb'
     - 'spec/services/notification_service_spec.rb'
     - 'spec/services/packages/debian/extract_metadata_service_spec.rb'
-    - 'spec/services/pod_logs/kubernetes_service_spec.rb'
     - 'spec/services/projects/destroy_service_spec.rb'
     - 'spec/services/security/merge_reports_service_spec.rb'
     - 'spec/services/system_notes/design_management_service_spec.rb'
@@ -940,8 +933,6 @@ Layout/ArgumentAlignment:
     - 'spec/views/projects/merge_requests/_commits.html.haml_spec.rb'
     - 'spec/views/projects/merge_requests/edit.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
-    - 'spec/workers/expire_job_cache_worker_spec.rb'
-    - 'spec/workers/expire_pipeline_cache_worker_spec.rb'
     - 'spec/workers/pipeline_notification_worker_spec.rb'
     - 'spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb'
     - 'spec/workers/update_external_pull_requests_worker_spec.rb'

diff --git a/.rubocop_todo/layout/first_array_element_indentation.yml b/.rubocop_todo/layout/first_array_element_indentation.yml
@@ -51,7 +51,6 @@ Layout/FirstArrayElementIndentation:
     - 'ee/app/models/ee/user.rb'
     - 'ee/app/models/protected_environment.rb'
     - 'ee/app/serializers/dashboard_environments_serializer.rb'
-    - 'ee/app/serializers/merge_request_compliance_entity.rb'
     - 'ee/app/services/app_sec/dast/profiles/update_service.rb'
     - 'ee/app/services/vulnerabilities/create_service_base.rb'
     - 'ee/lib/ee/api/helpers/award_emoji.rb'
@@ -147,7 +146,6 @@ Layout/FirstArrayElementIndentation:
     - 'lib/gitlab/email/message/in_product_marketing/verify.rb'
     - 'lib/gitlab/import_export/base/relation_factory.rb'
     - 'lib/gitlab/import_export/json/streaming_serializer.rb'
-    - 'lib/gitlab/integrations/sti_type.rb'
     - 'lib/gitlab/kroki.rb'
     - 'lib/gitlab/object_hierarchy.rb'
     - 'lib/gitlab/pagination/keyset/simple_order_builder.rb'
@@ -190,7 +188,6 @@ Layout/FirstArrayElementIndentation:
     - 'spec/controllers/projects/pipelines/tests_controller_spec.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
     - 'spec/deprecation_toolkit_env.rb'
-    - 'spec/experiments/new_project_sast_enabled_experiment_spec.rb'
     - 'spec/features/clusters/create_agent_spec.rb'
     - 'spec/features/issues/filtered_search/filter_issues_spec.rb'
     - 'spec/features/issues/filtered_search/visual_tokens_spec.rb'
@@ -243,7 +240,6 @@ Layout/FirstArrayElementIndentation:
     - 'spec/lib/gitlab/database/similarity_score_spec.rb'
     - 'spec/lib/gitlab/diff/char_diff_spec.rb'
     - 'spec/lib/gitlab/diff/file_collection_sorter_spec.rb'
-    - 'spec/lib/gitlab/elasticsearch/logs/pods_spec.rb'
     - 'spec/lib/gitlab/error_tracking/stack_trace_highlight_decorator_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/blob_service_spec.rb'
     - 'spec/lib/gitlab/github_import/parallel_scheduling_spec.rb'

diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -84,7 +84,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/app/helpers/ee/ci/jobs_helper.rb'
     - 'ee/app/helpers/ee/geo_helper.rb'
     - 'ee/app/helpers/ee/groups/group_members_helper.rb'
-    - 'ee/app/helpers/ee/ide_helper.rb'
     - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/helpers/ee/sidebars_helper.rb'
     - 'ee/app/helpers/ee/tree_helper.rb'
@@ -149,8 +148,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/spec/helpers/ee/projects/security/sast_configuration_helper_spec.rb'
     - 'ee/spec/helpers/groups/sso_helper_spec.rb'
     - 'ee/spec/helpers/nav/new_dropdown_helper_spec.rb'
-    - 'ee/spec/helpers/projects/security/policies_helper_spec.rb'
-    - 'ee/spec/helpers/projects/threat_monitoring_helper_spec.rb'
     - 'ee/spec/helpers/projects_helper_spec.rb'
     - 'ee/spec/helpers/routing/pseudonymization_helper_spec.rb'
     - 'ee/spec/helpers/search_helper_spec.rb'
@@ -267,8 +264,6 @@ Layout/FirstHashElementIndentation:
     - 'lib/gitlab/github_import/importer/diff_note_importer.rb'
     - 'lib/gitlab/github_import/importer/pull_request_merged_by_importer.rb'
     - 'lib/gitlab/gitlab_import/client.rb'
-    - 'lib/gitlab/graphql/query_analyzers/logger_analyzer.rb'
-    - 'lib/gitlab/graphql/query_analyzers/recursion_analyzer.rb'
     - 'lib/gitlab/hook_data/issue_builder.rb'
     - 'lib/gitlab/hook_data/release_builder.rb'
     - 'lib/gitlab/kubernetes.rb'
@@ -410,7 +405,6 @@ Layout/FirstHashElementIndentation:
     - 'spec/lib/gitlab/ci/parsers/security/common_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb'
-    - 'spec/lib/gitlab/ci/reports/coverage_reports_spec.rb'
     - 'spec/lib/gitlab/ci/reports/security/identifier_spec.rb'
     - 'spec/lib/gitlab/ci/reports/security/scanner_spec.rb'
     - 'spec/lib/gitlab/ci/reports/terraform_reports_spec.rb'
@@ -434,10 +428,8 @@ Layout/FirstHashElementIndentation:
     - 'spec/lib/gitlab/github_import/logger_spec.rb'
     - 'spec/lib/gitlab/github_import/object_counter_spec.rb'
     - 'spec/lib/gitlab/gpg_spec.rb'
-    - 'spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb'
     - 'spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb'
     - 'spec/lib/gitlab/graphql/tracers/timer_tracer_spec.rb'
-    - 'spec/lib/gitlab/hook_data/issuable_builder_spec.rb'
     - 'spec/lib/gitlab/http_spec.rb'
     - 'spec/lib/gitlab/i18n_spec.rb'
     - 'spec/lib/gitlab/import/logger_spec.rb'
@@ -531,9 +523,6 @@ Layout/FirstHashElementIndentation:
     - 'spec/services/metrics/dashboard/transient_embed_service_spec.rb'
     - 'spec/services/notes/render_service_spec.rb'
     - 'spec/services/packages/debian/parse_debian822_service_spec.rb'
-    - 'spec/services/pod_logs/base_service_spec.rb'
-    - 'spec/services/pod_logs/elasticsearch_service_spec.rb'
-    - 'spec/services/pod_logs/kubernetes_service_spec.rb'
     - 'spec/services/projects/container_repository/delete_tags_service_spec.rb'
     - 'spec/services/projects/create_from_template_service_spec.rb'
     - 'spec/services/projects/lfs_pointers/lfs_download_service_spec.rb'
@@ -555,7 +544,6 @@ Layout/FirstHashElementIndentation:
     - 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb'
     - 'spec/support/shared_examples/models/clusters/prometheus_client_shared.rb'
     - 'spec/support/shared_examples/models/cycle_analytics_stage_shared_examples.rb'
-    - 'spec/support/shared_examples/models/issuable_hook_data_shared_examples.rb'
     - 'spec/support/shared_examples/requests/rack_attack_shared_examples.rb'
     - 'spec/support_specs/graphql/arguments_spec.rb'
     - 'spec/support_specs/graphql/field_selection_spec.rb'