Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

12 files changed, 1 insertions, 93 deletions

diff --git a/.rubocop_todo/database/multiple_databases.yml b/.rubocop_todo/database/multiple_databases.yml
index e555c2f912b..7329d178dc1 100644
--- a/.rubocop_todo/database/multiple_databases.yml
+++ b/.rubocop_todo/database/multiple_databases.yml
@@ -1,14 +1,12 @@
 ---
 Database/MultipleDatabases:
   Exclude:
-  - ee/lib/ee/gitlab/database.rb
   - ee/lib/gitlab/geo/database_tasks.rb
   - ee/lib/gitlab/geo/geo_tasks.rb
   - ee/lib/gitlab/geo/health_check.rb
   - ee/lib/gitlab/geo/log_cursor/daemon.rb
   - ee/lib/pseudonymizer/dumper.rb
   - ee/lib/pseudonymizer/pager.rb
-  - ee/lib/system_check/geo/geo_database_configured_check.rb
   - ee/spec/lib/pseudonymizer/dumper_spec.rb
   - ee/spec/services/ee/merge_requests/update_service_spec.rb
   - lib/backup/database.rb
@@ -21,16 +19,13 @@ 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/schema_cache_with_renamed_table.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/metrics/samplers/database_sampler.rb
   - lib/gitlab/seeder.rb
-  - lib/gitlab/sherlock/query.rb
   - lib/system_check/orphans/repository_check.rb
   - spec/db/schema_spec.rb
   - spec/initializers/database_config_spec.rb
@@ -39,15 +34,8 @@ Database/MultipleDatabases:
   - spec/lib/gitlab/database_spec.rb
   - spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
   - spec/lib/gitlab/profiler_spec.rb
-  - spec/lib/gitlab/usage_data_metrics_spec.rb
-  - spec/lib/gitlab/usage_data_queries_spec.rb
   - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/constraints_spec.rb
   - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/joins_spec.rb
-  - spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb
-  - spec/lib/gitlab/utils/usage_data_spec.rb
-  - spec/models/project_feature_usage_spec.rb
-  - spec/models/users_statistics_spec.rb
-  - spec/services/users/activity_service_spec.rb
   - spec/support/caching.rb
   - spec/support/gitlab/usage/metrics_instrumentation_shared_examples.rb
   - spec/support/helpers/database_connection_helpers.rb
diff --git a/.rubocop_todo/gitlab/delegate_predicate_methods.yml b/.rubocop_todo/gitlab/delegate_predicate_methods.yml
index d31b4a30fc8..7ed3fc3e4fb 100644
--- a/.rubocop_todo/gitlab/delegate_predicate_methods.yml
+++ b/.rubocop_todo/gitlab/delegate_predicate_methods.yml
@@ -2,9 +2,6 @@
 Gitlab/DelegatePredicateMethods:
   Exclude:
   - app/models/clusters/cluster.rb
-  - app/models/concerns/ci/metadatable.rb
   - app/models/concerns/integrations/base_data_fields.rb
   - app/models/project.rb
   - ee/app/models/concerns/ee/ci/metadatable.rb
-  - ee/app/models/license.rb
-  - lib/gitlab/ci/trace/stream.rb
diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index 898768c2425..f13325378d3 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -369,6 +369,7 @@ Gitlab/NamespacedClass:
   - app/models/wiki_page.rb
   - app/models/wiki_page/meta.rb
   - app/models/wiki_page/slug.rb
+  - app/models/work_item.rb
   - app/models/x509_certificate.rb
   - app/models/x509_commit_signature.rb
   - app/models/x509_issuer.rb
diff --git a/.rubocop_todo/graphql/argument_name.yml b/.rubocop_todo/graphql/argument_name.yml
deleted file mode 100644
index 29d2ae7d4ae..00000000000
--- a/.rubocop_todo/graphql/argument_name.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-GraphQL/ArgumentName:
-  Exclude:
-  - ee/app/graphql/mutations/audit_events/external_audit_event_destinations/update.rb
diff --git a/.rubocop_todo/graphql/field_definitions.yml b/.rubocop_todo/graphql/field_definitions.yml
index c6ca8674264..35ed870fa41 100644
--- a/.rubocop_todo/graphql/field_definitions.yml
+++ b/.rubocop_todo/graphql/field_definitions.yml
@@ -5,9 +5,6 @@ GraphQL/FieldDefinitions:
   - app/graphql/types/group_type.rb
   - app/graphql/types/issue_type.rb
   - app/graphql/types/label_type.rb
-  - app/graphql/types/project_type.rb
-  - app/graphql/types/projects/topic_type.rb
-  - app/graphql/types/release_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/field_method.yml b/.rubocop_todo/graphql/field_method.yml
index 1cc4aa7e264..7c336451c41 100644
--- a/.rubocop_todo/graphql/field_method.yml
+++ b/.rubocop_todo/graphql/field_method.yml
@@ -6,7 +6,3 @@ GraphQL/FieldMethod:
   - app/graphql/types/metrics/dashboards/annotation_type.rb
   - app/graphql/types/packages/package_details_type.rb
   - app/graphql/types/project_type.rb
-  - ee/app/graphql/types/dast/profile_type.rb
-  - ee/app/graphql/types/dast_site_validation_type.rb
-  - ee/app/graphql/types/group_release_stats_type.rb
-  - ee/app/graphql/types/incident_management/oncall_rotation_type.rb
diff --git a/.rubocop_todo/graphql/ordered_arguments.yml b/.rubocop_todo/graphql/ordered_arguments.yml
index a2df1315ee9..3a4e805948d 100644
--- a/.rubocop_todo/graphql/ordered_arguments.yml
+++ b/.rubocop_todo/graphql/ordered_arguments.yml
@@ -4,9 +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/design_management/version/designs_at_version_resolver.rb
-  - app/graphql/resolvers/design_management/version_in_collection_resolver.rb
-  - app/graphql/resolvers/group_milestones_resolver.rb
   - app/graphql/resolvers/merge_requests_resolver.rb
   - app/graphql/resolvers/paginated_tree_resolver.rb
   - app/graphql/resolvers/tree_resolver.rb
diff --git a/.rubocop_todo/rails/include_url_helper.yml b/.rubocop_todo/rails/include_url_helper.yml
index 2dedba19c78..6a34c58ecf6 100644
--- a/.rubocop_todo/rails/include_url_helper.yml
+++ b/.rubocop_todo/rails/include_url_helper.yml
@@ -7,7 +7,6 @@ Rails/IncludeUrlHelper:
   - app/models/integrations/campfire.rb
   - app/models/integrations/confluence.rb
   - app/models/integrations/custom_issue_tracker.rb
-  - app/models/integrations/datadog.rb
   - app/models/integrations/discord.rb
   - app/models/integrations/ewm.rb
   - app/models/integrations/external_wiki.rb
diff --git a/.rubocop_todo/rails/save_bang.yml b/.rubocop_todo/rails/save_bang.yml
index d7c9366d85b..15361fd6743 100644
--- a/.rubocop_todo/rails/save_bang.yml
+++ b/.rubocop_todo/rails/save_bang.yml
@@ -1,24 +1,7 @@
 ---
 Rails/SaveBang:
   Exclude:
-  - ee/spec/initializers/fog_google_https_private_urls_spec.rb
   - ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb
-  - ee/spec/lib/gitlab/auth/ldap/access_spec.rb
-  - ee/spec/lib/gitlab/auth/o_auth/user_spec.rb
-  - ee/spec/lib/gitlab/auth/saml/user_spec.rb
-  - ee/spec/lib/gitlab/elastic/search_results_spec.rb
-  - ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
-  - ee/spec/lib/gitlab/geo_spec.rb
-  - ee/spec/lib/gitlab/git_access_spec.rb
-  - ee/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
-  - ee/spec/lib/gitlab/mirror_spec.rb
-  - ee/spec/models/application_setting_spec.rb
-  - ee/spec/models/approval_merge_request_rule_spec.rb
-  - ee/spec/models/approval_project_rule_spec.rb
-  - ee/spec/models/burndown_spec.rb
-  - ee/spec/models/elasticsearch_indexed_namespace_spec.rb
-  - ee/spec/models/gitlab_subscription_spec.rb
-  - ee/spec/models/issue_spec.rb
   - ee/spec/models/protected_environment_spec.rb
   - ee/spec/models/repository_spec.rb
   - ee/spec/models/scim_identity_spec.rb
@@ -28,31 +11,6 @@ Rails/SaveBang:
   - ee/spec/models/visible_approvable_spec.rb
   - ee/spec/models/vulnerabilities/feedback_spec.rb
   - ee/spec/models/vulnerabilities/issue_link_spec.rb
-  - ee/spec/services/ee/merge_requests/update_service_spec.rb
-  - ee/spec/services/ee/notes/quick_actions_service_spec.rb
-  - ee/spec/services/ee/notification_service_spec.rb
-  - ee/spec/services/epic_links/create_service_spec.rb
-  - ee/spec/services/epics/close_service_spec.rb
-  - ee/spec/services/epics/issue_promote_service_spec.rb
-  - ee/spec/services/epics/reopen_service_spec.rb
-  - ee/spec/services/epics/tree_reorder_service_spec.rb
-  - ee/spec/services/epics/update_dates_service_spec.rb
-  - ee/spec/services/epics/update_service_spec.rb
-  - ee/spec/services/geo/blob_verification_secondary_service_spec.rb
-  - ee/spec/services/geo/files_expire_service_spec.rb
-  - ee/spec/services/geo/metrics_update_service_spec.rb
-  - ee/spec/services/geo/registry_consistency_service_spec.rb
-  - ee/spec/services/geo/repository_verification_secondary_service_spec.rb
-  - ee/spec/services/groups/autocomplete_service_spec.rb
-  - ee/spec/services/ldap_group_reset_service_spec.rb
-  - ee/spec/services/lfs/unlock_file_service_spec.rb
-  - ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb
-  - ee/spec/services/quick_actions/interpret_service_spec.rb
-  - ee/spec/services/slash_commands/global_slack_handler_spec.rb
-  - ee/spec/services/start_pull_mirroring_service_spec.rb
-  - ee/spec/services/status_page/trigger_publish_service_spec.rb
-  - ee/spec/services/todo_service_spec.rb
-  - ee/spec/services/vulnerability_feedback/create_service_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
@@ -66,11 +24,6 @@ Rails/SaveBang:
   - 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/gfm/reference_rewriter_spec.rb
-  - spec/lib/gitlab/git_access_spec.rb
-  - spec/lib/gitlab/import_export/avatar_saver_spec.rb
-  - spec/lib/gitlab/import_export/base/relation_factory_spec.rb
-  - spec/lib/gitlab/import_export/design_repo_restorer_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
@@ -90,9 +43,3 @@ Rails/SaveBang:
   - 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
-  - spec/lib/gitlab/import_export/uploads_saver_spec.rb
-  - spec/lib/gitlab/import_export/wiki_restorer_spec.rb
-  - spec/lib/gitlab/lets_encrypt/client_spec.rb
-  - spec/lib/gitlab/middleware/go_spec.rb
-  - spec/lib/gitlab/shard_health_cache_spec.rb
-  - spec/mailers/notify_spec.rb
diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml
index 0e2b036c312..86d0632ac47 100644
--- a/.rubocop_todo/rails/time_zone.yml
+++ b/.rubocop_todo/rails/time_zone.yml
@@ -76,7 +76,6 @@ Rails/TimeZone:
   - lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
   - lib/gitlab/prometheus/queries/matched_metric_query.rb
   - lib/gitlab/prometheus_client.rb
-  - lib/gitlab/sherlock/transaction.rb
   - lib/gitlab/task_helpers.rb
   - lib/gitlab/x509/tag.rb
   - lib/grafana/time_window.rb
@@ -141,7 +140,6 @@ Rails/TimeZone:
   - spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
   - spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
   - spec/lib/gitlab/prometheus/queries/validate_query_spec.rb
-  - spec/lib/gitlab/sherlock/transaction_spec.rb
   - spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb
   - spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb
   - spec/lib/gitlab/updated_notes_paginator_spec.rb
diff --git a/.rubocop_todo/rspec/timecop_freeze.yml b/.rubocop_todo/rspec/timecop_freeze.yml
index c20c6214fa8..8deefee1164 100644
--- a/.rubocop_todo/rspec/timecop_freeze.yml
+++ b/.rubocop_todo/rspec/timecop_freeze.yml
@@ -2,9 +2,6 @@
 RSpec/TimecopFreeze:
   Exclude:
   - ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
-  - ee/spec/lib/gitlab/geo/git_push_http_spec.rb
-  - ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb
-  - ee/spec/lib/gitlab/geo/oauth/login_state_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
diff --git a/.rubocop_todo/style/open_struct_use.yml b/.rubocop_todo/style/open_struct_use.yml
index aa486f69562..ed4a53f2894 100644
--- a/.rubocop_todo/style/open_struct_use.yml
+++ b/.rubocop_todo/style/open_struct_use.yml
@@ -13,7 +13,6 @@ Style/OpenStructUse:
   - lib/gitlab/testing/request_inspector_middleware.rb
   - lib/mattermost/session.rb
   - spec/controllers/groups/clusters_controller_spec.rb
-  - spec/controllers/import/gitlab_controller_spec.rb
   - spec/controllers/projects/clusters_controller_spec.rb
   - spec/factories/go_module_versions.rb
   - spec/factories/wiki_pages.rb
@@ -26,17 +25,13 @@ Style/OpenStructUse:
   - spec/graphql/mutations/commits/create_spec.rb
   - spec/helpers/application_settings_helper_spec.rb
   - spec/helpers/profiles_helper_spec.rb
-  - spec/initializers/doorkeeper_spec.rb
   - spec/lib/gitlab/auth/o_auth/provider_spec.rb
-  - spec/lib/gitlab/database/migrations/runner_spec.rb
   - spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb
   - 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/models/user_spec.rb
-  - spec/presenters/packages/nuget/search_results_presenter_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