Add latest changes from gitlab-org/gitlab@master

19 files changed, 1 insertions, 35 deletions

diff --git a/.rubocop_todo/gitlab/doc_url.yml b/.rubocop_todo/gitlab/doc_url.yml
index fbc58c436e8..05b5d155cbf 100644
--- a/.rubocop_todo/gitlab/doc_url.yml
+++ b/.rubocop_todo/gitlab/doc_url.yml
@@ -22,7 +22,6 @@ Gitlab/DocUrl:
     - 'ee/lib/ee/gitlab/ci/pipeline/quota/size.rb'
     - 'ee/lib/system_check/app/advanced_search_migrations_check.rb'
     - 'ee/lib/tasks/gitlab/geo.rake'
-    - 'lib/backup/database.rb'
     - 'lib/feature.rb'
     - 'lib/gitlab/audit/auditor.rb'
     - 'lib/gitlab/ci/config/entry/processable.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 17612d463e8..59f19430b57 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -2381,7 +2381,6 @@ Layout/LineLength:
     - 'lib/atlassian/jira_connect/client.rb'
     - 'lib/atlassian/jira_connect/serializers/repository_entity.rb'
     - 'lib/backup.rb'
-    - 'lib/backup/files.rb'
     - 'lib/backup/gitaly_backup.rb'
     - 'lib/backup/manager.rb'
     - 'lib/banzai/filter/autolink_filter.rb'
@@ -3405,10 +3404,8 @@ Layout/LineLength:
     - 'spec/lib/api/helpers_spec.rb'
     - 'spec/lib/atlassian/jira_connect/client_spec.rb'
     - 'spec/lib/atlassian/jira_issue_key_extractor_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
-    - 'spec/lib/backup/repositories_spec.rb'
     - 'spec/lib/banzai/commit_renderer_spec.rb'
     - 'spec/lib/banzai/filter/ascii_doc_post_processing_filter_spec.rb'
     - 'spec/lib/banzai/filter/ascii_doc_sanitization_filter_spec.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index bd901e40016..708944acbc7 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -360,7 +360,6 @@ Layout/SpaceInLambdaLiteral:
     - 'spec/deprecation_toolkit_env.rb'
     - 'spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb'
     - 'spec/helpers/namespaces_helper_spec.rb'
-    - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/container_registry/client_spec.rb'
     - 'spec/lib/gitlab/analytics/date_filler_spec.rb'
     - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb'
diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
index 2c9d5c3da14..47448320010 100644
--- a/.rubocop_todo/lint/unused_method_argument.yml
+++ b/.rubocop_todo/lint/unused_method_argument.yml
@@ -280,7 +280,6 @@ Lint/UnusedMethodArgument:
     - 'ee/lib/compliance_management/compliance_report/commit_loader.rb'
     - 'ee/lib/ee/api/ci/helpers/runner.rb'
     - 'ee/lib/ee/api/entities/project.rb'
-    - 'ee/lib/ee/backup/repositories.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/sync/proxy.rb'
     - 'ee/lib/ee/gitlab/geo_git_access.rb'
     - 'ee/lib/ee/gitlab/tracking.rb'
@@ -328,9 +327,6 @@ Lint/UnusedMethodArgument:
     - 'lib/api/projects_relation_builder.rb'
     - 'lib/api/search.rb'
     - 'lib/atlassian/jira_connect/client.rb'
-    - 'lib/backup/database.rb'
-    - 'lib/backup/files.rb'
-    - 'lib/backup/gitaly_backup.rb'
     - 'lib/banzai/filter/playable_link_filter.rb'
     - 'lib/banzai/filter/references/abstract_reference_filter.rb'
     - 'lib/banzai/filter/references/commit_range_reference_filter.rb'
diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml
index 49d95cfeac3..0b96f15e24a 100644
--- a/.rubocop_todo/rails/file_path.yml
+++ b/.rubocop_todo/rails/file_path.yml
@@ -93,7 +93,6 @@ Rails/FilePath:
     - 'spec/features/uploads/user_uploads_file_to_note_spec.rb'
     - 'spec/helpers/blob_helper_spec.rb'
     - 'spec/helpers/startupjs_helper_spec.rb'
-    - 'spec/lib/backup/database_spec.rb'
     - 'spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb'
     - 'spec/lib/gitlab/database/schema_migrations/context_spec.rb'
     - 'spec/lib/gitlab/feature_categories_spec.rb'
diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml
index bac4094b61b..947b87e30a3 100644
--- a/.rubocop_todo/rspec/any_instance_of.yml
+++ b/.rubocop_todo/rspec/any_instance_of.yml
@@ -118,7 +118,6 @@ RSpec/AnyInstanceOf:
     - 'spec/lib/api/entities/merge_request_basic_spec.rb'
     - 'spec/lib/api/entities/merge_request_changes_spec.rb'
     - 'spec/lib/api/helpers_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
     - 'spec/lib/banzai/commit_renderer_spec.rb'
     - 'spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 0fd9bdf250c..d5b2ba83599 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -284,7 +284,6 @@ RSpec/ContextWording:
     - 'ee/spec/lib/ee/api/entities/user_with_admin_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/variables_helpers_spec.rb'
     - 'ee/spec/lib/ee/api/helpers_spec.rb'
-    - 'ee/spec/lib/ee/backup/repositories_spec.rb'
     - 'ee/spec/lib/ee/gitlab/alert_management/payload/generic_spec.rb'
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
     - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb'
@@ -1466,7 +1465,6 @@ RSpec/ContextWording:
     - 'spec/lib/atlassian/jira_connect_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
-    - 'spec/lib/backup/repositories_spec.rb'
     - 'spec/lib/banzai/color_parser_spec.rb'
     - 'spec/lib/banzai/filter/absolute_link_filter_spec.rb'
     - 'spec/lib/banzai/filter/asset_proxy_filter_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index b4fa6a50025..a9cbafd04a7 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -2580,8 +2580,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/api/validations/validators/untrusted_regexp_spec.rb'
     - 'spec/lib/backup/database_backup_error_spec.rb'
     - 'spec/lib/backup/file_backup_error_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
-    - 'spec/lib/backup/task_spec.rb'
     - 'spec/lib/banzai/filter/inline_diff_filter_spec.rb'
     - 'spec/lib/banzai/pipeline/incident_management/timeline_event_pipeline_spec.rb'
     - 'spec/lib/bitbucket/collection_spec.rb'
diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index a14d560a3eb..13ea468885a 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -289,7 +289,6 @@ RSpec/NamedSubject:
     - 'ee/spec/lib/ee/api/helpers/notes_helpers_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/scim_pagination_spec.rb'
     - 'ee/spec/lib/ee/api/helpers_spec.rb'
-    - 'ee/spec/lib/ee/backup/repositories_spec.rb'
     - 'ee/spec/lib/ee/bulk_imports/groups/stage_spec.rb'
     - 'ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb'
     - 'ee/spec/lib/ee/feature_spec.rb'
@@ -1686,13 +1685,9 @@ RSpec/NamedSubject:
     - 'spec/lib/atlassian/jira_connect/serializers/repository_entity_spec.rb'
     - 'spec/lib/atlassian/jira_connect/serializers/reviewer_entity_spec.rb'
     - 'spec/lib/backup/database_backup_error_spec.rb'
-    - 'spec/lib/backup/database_spec.rb'
     - 'spec/lib/backup/dump/postgres_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
-    - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
-    - 'spec/lib/backup/repositories_spec.rb'
-    - 'spec/lib/backup/task_spec.rb'
+    - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/banzai/color_parser_spec.rb'
     - 'spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb'
     - 'spec/lib/banzai/filter/math_filter_spec.rb'
diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml
index 5aaa1847409..3cc9d67a7b3 100644
--- a/.rubocop_todo/rspec/return_from_stub.yml
+++ b/.rubocop_todo/rspec/return_from_stub.yml
@@ -105,7 +105,6 @@ RSpec/ReturnFromStub:
     - 'spec/helpers/users/callouts_helper_spec.rb'
     - 'spec/helpers/users_helper_spec.rb'
     - 'spec/helpers/visibility_level_helper_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
     - 'spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb'
     - 'spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb'
     - 'spec/lib/banzai/reference_parser/issue_parser_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 63bebcbb2df..0c52ae19d53 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -309,8 +309,6 @@ RSpec/VerifiedDoubles:
     - 'spec/lib/api/helpers/variables_helpers_spec.rb'
     - 'spec/lib/api/helpers_spec.rb'
     - 'spec/lib/atlassian/jira_connect/client_spec.rb'
-    - 'spec/lib/backup/files_spec.rb'
-    - 'spec/lib/backup/repositories_spec.rb'
     - 'spec/lib/banzai/cross_project_reference_spec.rb'
     - 'spec/lib/banzai/filter/gollum_tags_filter_spec.rb'
     - 'spec/lib/banzai/filter/repository_link_filter_spec.rb'
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index f8a054f1c86..f7120a87472 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -91,7 +91,6 @@ Style/EmptyMethod:
     - 'lib/api/helpers/packages/conan/api_helpers.rb'
     - 'lib/api/helpers/projects_helpers.rb'
     - 'lib/api/projects_relation_builder.rb'
-    - 'lib/backup/task.rb'
     - 'lib/gitlab/alert_management/payload/base.rb'
     - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb'
     - 'lib/gitlab/background_migration/create_security_setting.rb'
diff --git a/.rubocop_todo/style/explicit_block_argument.yml b/.rubocop_todo/style/explicit_block_argument.yml
index 1e5725a2ef0..1eaaaf8af6a 100644
--- a/.rubocop_todo/style/explicit_block_argument.yml
+++ b/.rubocop_todo/style/explicit_block_argument.yml
@@ -19,7 +19,6 @@ Style/ExplicitBlockArgument:
     - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb'
     - 'ee/app/services/group_saml/identity/destroy_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/base_merge_requests_service.rb'
-    - 'ee/lib/ee/backup/repositories.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
     - 'ee/lib/gitlab/audit/events/preloader.rb'
     - 'ee/lib/gitlab/ci/config/security_orchestration_policies/processor.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 65847c093d5..933b33999e3 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -411,7 +411,6 @@ Style/GuardClause:
     - 'lib/api/helpers/snippets_helpers.rb'
     - 'lib/api/helpers/version.rb'
     - 'lib/api/projects.rb'
-    - 'lib/backup/files.rb'
     - 'lib/banzai/filter/external_link_filter.rb'
     - 'lib/banzai/filter/gollum_tags_filter.rb'
     - 'lib/banzai/filter/references/merge_request_reference_filter.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index f6d56b477b7..b8132af6b62 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -1794,7 +1794,6 @@ Style/InlineDisableAnnotation:
     - 'ee/lib/ee/api/project_milestones.rb'
     - 'ee/lib/ee/api/projects.rb'
     - 'ee/lib/ee/api/settings.rb'
-    - 'ee/lib/ee/backup/repositories.rb'
     - 'ee/lib/ee/banzai/filter/references/epic_reference_filter.rb'
     - 'ee/lib/ee/banzai/reference_parser/epic_parser.rb'
     - 'ee/lib/ee/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb'
@@ -2833,7 +2832,6 @@ Style/InlineDisableAnnotation:
     - 'spec/lib/api/base_spec.rb'
     - 'spec/lib/api/entities/wiki_page_spec.rb'
     - 'spec/lib/api/helpers/packages/npm_spec.rb'
-    - 'spec/lib/backup/database_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
     - 'spec/lib/banzai/filter/footnote_filter_spec.rb'
     - 'spec/lib/banzai/filter/image_link_filter_spec.rb'
diff --git a/.rubocop_todo/style/numeric_literal_prefix.yml b/.rubocop_todo/style/numeric_literal_prefix.yml
index 0004b0da84b..54dfdd203cd 100644
--- a/.rubocop_todo/style/numeric_literal_prefix.yml
+++ b/.rubocop_todo/style/numeric_literal_prefix.yml
@@ -15,7 +15,6 @@ Style/NumericLiteralPrefix:
     - 'ee/spec/models/gitlab/seat_link_data_spec.rb'
     - 'ee/spec/services/incident_management/oncall_schedules/update_service_spec.rb'
     - 'ee/spec/workers/sync_seat_link_worker_spec.rb'
-    - 'lib/backup/files.rb'
     - 'lib/gitlab/import_export/command_line_util.rb'
     - 'lib/gitlab/jwt_authenticatable.rb'
     - 'lib/system_check/app/uploads_path_permission_check.rb'
diff --git a/.rubocop_todo/style/redundant_interpolation.yml b/.rubocop_todo/style/redundant_interpolation.yml
index d50db1cbbbd..c934d8660d1 100644
--- a/.rubocop_todo/style/redundant_interpolation.yml
+++ b/.rubocop_todo/style/redundant_interpolation.yml
@@ -3,7 +3,6 @@
 Style/RedundantInterpolation:
   Exclude:
     - 'lib/backup/manager.rb'
-    - 'lib/backup/task.rb'
     - 'lib/gitlab/application_rate_limiter.rb'
     - 'lib/gitlab/chat/responder/mattermost.rb'
     - 'lib/gitlab/ci/build/releaser.rb'
diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index b14f8236aac..b59c495ceb5 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -75,7 +75,6 @@ Style/StringConcatenation:
     - 'ee/spec/tasks/gitlab/license_rake_spec.rb'
     - 'lib/api/entities/tree_object.rb'
     - 'lib/api/internal/kubernetes.rb'
-    - 'lib/backup/files.rb'
     - 'lib/backup/manager.rb'
     - 'lib/banzai/filter/blockquote_fence_filter.rb'
     - 'lib/banzai/filter/references/label_reference_filter.rb'
@@ -157,8 +156,6 @@ Style/StringConcatenation:
     - 'spec/helpers/diff_helper_spec.rb'
     - 'spec/helpers/search_helper_spec.rb'
     - 'spec/lib/api/helpers/related_resources_helpers_spec.rb'
-    - 'spec/lib/backup/gitaly_backup_spec.rb'
-    - 'spec/lib/backup/repositories_spec.rb'
     - 'spec/lib/banzai/filter/color_filter_spec.rb'
     - 'spec/lib/banzai/filter/external_link_filter_spec.rb'
     - 'spec/lib/banzai/filter/front_matter_filter_spec.rb'
diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml
index 52020404660..e90a5b78f35 100644
--- a/.rubocop_todo/style/symbol_proc.yml
+++ b/.rubocop_todo/style/symbol_proc.yml
@@ -167,7 +167,6 @@ Style/SymbolProc:
     - 'spec/graphql/types/work_items/widget_type_enum_spec.rb'
     - 'spec/helpers/instance_configuration_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
-    - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers_spec.rb'
     - 'spec/lib/gitlab/git/commit_spec.rb'
     - 'spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb'