Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

10 files changed, 27 insertions, 67 deletions

diff --git a/.rubocop_todo/database/multiple_databases.yml b/.rubocop_todo/database/multiple_databases.yml
index 7329d178dc1..69bc0b64a30 100644
--- a/.rubocop_todo/database/multiple_databases.yml
+++ b/.rubocop_todo/database/multiple_databases.yml
@@ -11,7 +11,6 @@ Database/MultipleDatabases:
   - ee/spec/services/ee/merge_requests/update_service_spec.rb
   - lib/backup/database.rb
   - lib/backup/manager.rb
-  - lib/gitlab/current_settings.rb
   - lib/gitlab/database/load_balancing/load_balancer.rb
   - lib/gitlab/database/load_balancing.rb
   - lib/gitlab/database/load_balancing/sticking.rb
@@ -19,18 +18,15 @@ Database/MultipleDatabases:
   - lib/gitlab/database/migrations/observers/query_log.rb
   - lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb
   - lib/gitlab/database.rb
-  - lib/gitlab/database/with_lock_retries.rb
   - lib/gitlab/gitlab_import/importer.rb
   - lib/gitlab/health_checks/db_check.rb
   - lib/gitlab/import_export/base/relation_factory.rb
   - lib/gitlab/import_export/group/relation_tree_restorer.rb
   - lib/gitlab/legacy_github_import/importer.rb
   - lib/gitlab/seeder.rb
-  - lib/system_check/orphans/repository_check.rb
   - spec/db/schema_spec.rb
   - spec/initializers/database_config_spec.rb
   - spec/lib/backup/manager_spec.rb
-  - spec/lib/gitlab/current_settings_spec.rb
   - spec/lib/gitlab/database_spec.rb
   - spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
   - spec/lib/gitlab/profiler_spec.rb
diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index f13325378d3..7d0f69c9300 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -428,6 +428,7 @@ Gitlab/NamespacedClass:
   - app/policies/user_policy.rb
   - app/policies/wiki_page_policy.rb
   - app/policies/wiki_policy.rb
+  - app/policies/work_item_policy.rb
   - app/presenters/award_emoji_presenter.rb
   - app/presenters/blob_presenter.rb
   - app/presenters/board_presenter.rb
@@ -836,7 +837,6 @@ Gitlab/NamespacedClass:
   - app/workers/pages_domain_verification_cron_worker.rb
   - app/workers/pages_domain_verification_worker.rb
   - app/workers/pages_transfer_worker.rb
-  - app/workers/pages_update_configuration_worker.rb
   - app/workers/pages_worker.rb
   - app/workers/partition_creation_worker.rb
   - app/workers/pipeline_hooks_worker.rb
diff --git a/.rubocop_todo/graphql/field_definitions.yml b/.rubocop_todo/graphql/field_definitions.yml
index 35ed870fa41..e1245a53409 100644
--- a/.rubocop_todo/graphql/field_definitions.yml
+++ b/.rubocop_todo/graphql/field_definitions.yml
@@ -1,10 +1,6 @@
 ---
 GraphQL/FieldDefinitions:
   Exclude:
-  - app/graphql/types/commit_type.rb
-  - app/graphql/types/group_type.rb
-  - app/graphql/types/issue_type.rb
-  - app/graphql/types/label_type.rb
   - ee/app/graphql/types/ci/code_quality_degradation_type.rb
   - ee/app/graphql/types/epic_type.rb
   - ee/app/graphql/types/group_release_stats_type.rb
diff --git a/.rubocop_todo/graphql/ordered_arguments.yml b/.rubocop_todo/graphql/ordered_arguments.yml
index 3a4e805948d..def1b0085e4 100644
--- a/.rubocop_todo/graphql/ordered_arguments.yml
+++ b/.rubocop_todo/graphql/ordered_arguments.yml
@@ -4,10 +4,6 @@ GraphQL/OrderedArguments:
   - app/graphql/resolvers/base_issues_resolver.rb
   - app/graphql/resolvers/design_management/designs_resolver.rb
   - app/graphql/resolvers/design_management/version/design_at_version_resolver.rb
-  - app/graphql/resolvers/merge_requests_resolver.rb
-  - app/graphql/resolvers/paginated_tree_resolver.rb
-  - app/graphql/resolvers/tree_resolver.rb
-  - app/graphql/resolvers/users/groups_resolver.rb
   - app/graphql/types/commit_action_type.rb
   - app/graphql/types/diff_paths_input_type.rb
   - app/graphql/types/issues/negated_issue_filter_input_type.rb
diff --git a/.rubocop_todo/rails/save_bang.yml b/.rubocop_todo/rails/save_bang.yml
index 15361fd6743..e1698a83682 100644
--- a/.rubocop_todo/rails/save_bang.yml
+++ b/.rubocop_todo/rails/save_bang.yml
@@ -2,44 +2,3 @@
 Rails/SaveBang:
   Exclude:
   - ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb
-  - ee/spec/models/protected_environment_spec.rb
-  - ee/spec/models/repository_spec.rb
-  - ee/spec/models/scim_identity_spec.rb
-  - ee/spec/models/scim_oauth_access_token_spec.rb
-  - ee/spec/models/upload_spec.rb
-  - ee/spec/models/user_preference_spec.rb
-  - ee/spec/models/visible_approvable_spec.rb
-  - ee/spec/models/vulnerabilities/feedback_spec.rb
-  - ee/spec/models/vulnerabilities/issue_link_spec.rb
-  - spec/lib/backup/manager_spec.rb
-  - spec/lib/gitlab/alerting/alert_spec.rb
-  - spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
-  - spec/lib/gitlab/auth/ldap/user_spec.rb
-  - spec/lib/gitlab/auth/o_auth/user_spec.rb
-  - spec/lib/gitlab/auth/saml/user_spec.rb
-  - spec/lib/gitlab/auth_spec.rb
-  - spec/lib/gitlab/authorized_keys_spec.rb
-  - spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
-  - spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
-  - spec/lib/gitlab/database/custom_structure_spec.rb
-  - spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
-  - spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
-  - spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
-  - spec/lib/gitlab/import_export/fork_spec.rb
-  - spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/group/relation_factory_spec.rb
-  - spec/lib/gitlab/import_export/group/tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/importer_spec.rb
-  - spec/lib/gitlab/import_export/lfs_restorer_spec.rb
-  - spec/lib/gitlab/import_export/lfs_saver_spec.rb
-  - spec/lib/gitlab/import_export/members_mapper_spec.rb
-  - spec/lib/gitlab/import_export/project/relation_factory_spec.rb
-  - spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
-  - spec/lib/gitlab/import_export/project/tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/saver_spec.rb
-  - spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/snippet_repo_saver_spec.rb
-  - spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/snippets_repo_saver_spec.rb
-  - spec/lib/gitlab/import_export/uploads_manager_spec.rb
diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml
index f7a8cfb3968..bf1bc408b66 100644
--- a/.rubocop_todo/rspec/any_instance_of.yml
+++ b/.rubocop_todo/rspec/any_instance_of.yml
@@ -29,7 +29,6 @@ RSpec/AnyInstanceOf:
   - ee/spec/features/security/project/internal_access_spec.rb
   - ee/spec/features/security/project/private_access_spec.rb
   - ee/spec/features/security/project/public_access_spec.rb
-  - ee/spec/features/trials/capture_lead_spec.rb
   - ee/spec/features/trials/select_namespace_spec.rb
   - ee/spec/features/users/login_spec.rb
   - ee/spec/graphql/mutations/dast_on_demand_scans/create_spec.rb
diff --git a/.rubocop_todo/rspec/leaky_constant_declaration.yml b/.rubocop_todo/rspec/leaky_constant_declaration.yml
new file mode 100644
index 00000000000..b8b3980ef4f
--- /dev/null
+++ b/.rubocop_todo/rspec/leaky_constant_declaration.yml
@@ -0,0 +1,15 @@
+---
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+  - spec/db/schema_spec.rb
+  - spec/lib/gitlab/config/entry/simplifiable_spec.rb
+  - spec/lib/gitlab/quick_actions/dsl_spec.rb
+  - spec/lib/marginalia_spec.rb
+  - spec/mailers/notify_spec.rb
+  - spec/models/concerns/batch_destroy_dependent_associations_spec.rb
+  - spec/models/concerns/bulk_insert_safe_spec.rb
+  - spec/models/concerns/bulk_insertable_associations_spec.rb
+  - spec/models/concerns/triggerable_hooks_spec.rb
+  - spec/models/repository_spec.rb
+  - spec/services/clusters/applications/check_installation_progress_service_spec.rb
+  - spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb
diff --git a/.rubocop_todo/rspec/multiple_memoized_helpers.yml b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
new file mode 100644
index 00000000000..2f6d390bec2
--- /dev/null
+++ b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
@@ -0,0 +1,11 @@
+---
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+  - spec/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback_spec.rb
+  - spec/lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid_spec.rb
+  - spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb
+  - spec/requests/api/ci/runner/jobs_artifacts_spec.rb
+  - ee/spec/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids_spec.rb
+  - ee/spec/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings_spec.rb
+  - ee/spec/services/ee/boards/issues/move_service_spec.rb
+  - ee/spec/services/security/store_report_service_spec.rb
diff --git a/.rubocop_todo/rspec/timecop_freeze.yml b/.rubocop_todo/rspec/timecop_freeze.yml
index 8deefee1164..2967793e42a 100644
--- a/.rubocop_todo/rspec/timecop_freeze.yml
+++ b/.rubocop_todo/rspec/timecop_freeze.yml
@@ -1,8 +1,6 @@
 ---
 RSpec/TimecopFreeze:
   Exclude:
-  - ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
-  - ee/spec/lib/gitlab/insights/reducers/count_per_period_reducer_spec.rb
   - ee/spec/models/merge_train_spec.rb
   - ee/spec/support/shared_contexts/lib/gitlab/insights/reducers/reducers_shared_contexts.rb
   - qa/spec/support/repeater_spec.rb
diff --git a/.rubocop_todo/style/open_struct_use.yml b/.rubocop_todo/style/open_struct_use.yml
index ed4a53f2894..80239770db0 100644
--- a/.rubocop_todo/style/open_struct_use.yml
+++ b/.rubocop_todo/style/open_struct_use.yml
@@ -12,12 +12,8 @@ Style/OpenStructUse:
   - lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb
   - lib/gitlab/testing/request_inspector_middleware.rb
   - lib/mattermost/session.rb
-  - spec/controllers/groups/clusters_controller_spec.rb
-  - spec/controllers/projects/clusters_controller_spec.rb
   - spec/factories/go_module_versions.rb
   - spec/factories/wiki_pages.rb
-  - spec/features/projects/clusters_spec.rb
-  - spec/finders/template_finder_spec.rb
   - spec/graphql/mutations/branches/create_spec.rb
   - spec/graphql/mutations/clusters/agent_tokens/create_spec.rb
   - spec/graphql/mutations/clusters/agents/create_spec.rb
@@ -30,11 +26,5 @@ Style/OpenStructUse:
   - spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
   - spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
   - spec/lib/gitlab/quick_actions/command_definition_spec.rb
-  - spec/models/design_management/design_action_spec.rb
-  - spec/models/design_management/design_at_version_spec.rb
-  - spec/services/packages/nuget/metadata_extraction_service_spec.rb
-  - spec/services/projects/import_service_spec.rb
   - spec/services/system_note_service_spec.rb
-  - spec/support/helpers/import_spec_helper.rb
-  - spec/support/helpers/login_helpers.rb
   - spec/support/helpers/repo_helpers.rb