Add latest changes from gitlab-org/gitlab@master

12 files changed, 0 insertions, 66 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index d859adfc540..6d241d02b13 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1789,12 +1789,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb'
     - 'lib/gitlab/metrics/requests_rack_middleware.rb'
     - 'lib/gitlab/other_markup.rb'
-    - 'lib/gitlab/phabricator_import/cache/map.rb'
-    - 'lib/gitlab/phabricator_import/conduit/maniphest.rb'
-    - 'lib/gitlab/phabricator_import/conduit/response.rb'
-    - 'lib/gitlab/phabricator_import/conduit/user.rb'
-    - 'lib/gitlab/phabricator_import/issues/importer.rb'
-    - 'lib/gitlab/phabricator_import/user_finder.rb'
     - 'lib/gitlab/project_authorizations.rb'
     - 'lib/gitlab/redis/multi_store.rb'
     - 'lib/gitlab/request_context.rb'
@@ -2270,11 +2264,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/middleware/multipart_spec.rb'
     - 'spec/lib/gitlab/pagination_delegate_spec.rb'
     - 'spec/lib/gitlab/path_regex_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/cache/map_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb'
     - 'spec/lib/gitlab/profiler_spec.rb'
     - 'spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb'
     - 'spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb'
diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
index 95de4fabf40..191c581da1b 100644
--- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml
+++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
@@ -132,7 +132,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'app/workers/concerns/limited_capacity/job_tracker.rb'
     - 'app/workers/database/batched_background_migration/ci_database_worker.rb'
     - 'app/workers/gitlab/import/stuck_project_import_jobs_worker.rb'
-    - 'app/workers/gitlab/phabricator_import/import_tasks_worker.rb'
     - 'config/application.rb'
     - 'config/initializers/fog_core_patch.rb'
     - 'config/initializers/rubyzip.rb'
@@ -468,18 +467,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'lib/gitlab/merge_requests/mergeability/results_store.rb'
     - 'lib/gitlab/merge_requests/message_generator.rb'
     - 'lib/gitlab/pagination/keyset/sql_type_missing_error.rb'
-    - 'lib/gitlab/phabricator_import/cache/map.rb'
-    - 'lib/gitlab/phabricator_import/conduit.rb'
-    - 'lib/gitlab/phabricator_import/conduit/client.rb'
-    - 'lib/gitlab/phabricator_import/conduit/maniphest.rb'
-    - 'lib/gitlab/phabricator_import/conduit/pagination.rb'
-    - 'lib/gitlab/phabricator_import/conduit/response.rb'
-    - 'lib/gitlab/phabricator_import/conduit/tasks_response.rb'
-    - 'lib/gitlab/phabricator_import/conduit/user.rb'
-    - 'lib/gitlab/phabricator_import/issues/importer.rb'
-    - 'lib/gitlab/phabricator_import/issues/task_importer.rb'
-    - 'lib/gitlab/phabricator_import/representation/task.rb'
-    - 'lib/gitlab/phabricator_import/worker_state.rb'
     - 'lib/gitlab/relative_positioning/gap.rb'
     - 'lib/gitlab/safe_device_detector.rb'
     - 'lib/gitlab/spamcheck/client.rb'
@@ -618,15 +605,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'spec/lib/gitlab/metrics/rails_slis_spec.rb'
     - 'spec/lib/gitlab/middleware/handle_malformed_strings_spec.rb'
     - 'spec/lib/gitlab/middleware/request_context_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/client_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/project_creator_spec.rb'
     - 'spec/lib/gitlab/request_endpoints_spec.rb'
     - 'spec/lib/gitlab/slash_commands/presenters/issue_new_spec.rb'
     - 'spec/lib/gitlab/ssh/commit_spec.rb'
@@ -843,8 +821,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'spec/views/shared/ssh_keys/_key_delete.html.haml_spec.rb'
     - 'spec/views/shared/wikis/_sidebar.html.haml_spec.rb'
     - 'spec/workers/auto_devops/disable_worker_spec.rb'
-    - 'spec/workers/gitlab/phabricator_import/base_worker_spec.rb'
-    - 'spec/workers/gitlab/phabricator_import/import_tasks_worker_spec.rb'
     - 'spec/workers/integrations/execute_worker_spec.rb'
     - 'spec/workers/partition_creation_worker_spec.rb'
     - 'spec/workers/projects/delete_branch_worker_spec.rb'
diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index a7dc68794aa..4537d0a499b 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -217,7 +217,6 @@ Layout/FirstHashElementIndentation:
     - 'spec/lib/gitlab/import_export/members_mapper_spec.rb'
     - 'spec/lib/gitlab/instrumentation_helper_spec.rb'
     - 'spec/lib/gitlab/metrics/subscribers/action_cable_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
     - 'spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb'
     - 'spec/lib/gitlab/workhorse_spec.rb'
     - 'spec/lib/mattermost/team_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 01f4645f928..a0e12418711 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -4178,9 +4178,6 @@ Layout/LineLength:
     - 'spec/lib/gitlab/pagination/offset_pagination_spec.rb'
     - 'spec/lib/gitlab/path_regex_spec.rb'
     - 'spec/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/user_finder_spec.rb'
     - 'spec/lib/gitlab/project_search_results_spec.rb'
     - 'spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb'
     - 'spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb'
diff --git a/.rubocop_todo/rails/pluck.yml b/.rubocop_todo/rails/pluck.yml
index b86b26b31fa..791e15c64f8 100644
--- a/.rubocop_todo/rails/pluck.yml
+++ b/.rubocop_todo/rails/pluck.yml
@@ -181,7 +181,6 @@ Rails/Pluck:
     - 'spec/lib/gitlab/language_detection_spec.rb'
     - 'spec/lib/gitlab/lograge/custom_options_spec.rb'
     - 'spec/lib/gitlab/metrics/dashboard/processor_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb'
     - 'spec/lib/gitlab/relative_positioning/item_context_spec.rb'
     - 'spec/lib/gitlab/search/query_spec.rb'
     - 'spec/lib/gitlab/sidekiq_config/worker_matcher_spec.rb'
diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml
index 220a6f39550..00e8150585d 100644
--- a/.rubocop_todo/rails/time_zone.yml
+++ b/.rubocop_todo/rails/time_zone.yml
@@ -44,7 +44,6 @@ Rails/TimeZone:
     - 'lib/gitlab/instrumentation_helper.rb'
     - 'lib/gitlab/lfs_token.rb'
     - 'lib/gitlab/loop_helpers.rb'
-    - 'lib/gitlab/phabricator_import/representation/task.rb'
     - 'lib/gitlab/popen.rb'
     - 'lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb'
     - 'lib/gitlab/prometheus/queries/matched_metric_query.rb'
@@ -97,8 +96,6 @@ Rails/TimeZone:
     - 'spec/lib/gitlab/lfs_token_spec.rb'
     - 'spec/lib/gitlab/log_timestamp_formatter_spec.rb'
     - 'spec/lib/gitlab/middleware/rails_queue_duration_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/representation/task_spec.rb'
     - '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'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 2cabb373326..5cdfbef0acc 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -1985,7 +1985,6 @@ RSpec/ContextWording:
     - 'spec/lib/gitlab/patch/prependable_spec.rb'
     - 'spec/lib/gitlab/path_regex_spec.rb'
     - 'spec/lib/gitlab/performance_bar_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/importer_spec.rb'
     - 'spec/lib/gitlab/popen_spec.rb'
     - 'spec/lib/gitlab/process_supervisor_spec.rb'
     - 'spec/lib/gitlab/profiler_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 7a8388768bb..694367443de 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -1796,7 +1796,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/controllers/import/gitea_controller_spec.rb'
     - 'spec/controllers/import/gitlab_controller_spec.rb'
     - 'spec/controllers/import/manifest_controller_spec.rb'
-    - 'spec/controllers/import/phabricator_controller_spec.rb'
     - 'spec/controllers/invites_controller_spec.rb'
     - 'spec/controllers/jira_connect/app_descriptor_controller_spec.rb'
     - 'spec/controllers/jira_connect/branches_controller_spec.rb'
@@ -4287,21 +4286,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/lib/gitlab/performance_bar/stats_spec.rb'
     - 'spec/lib/gitlab/performance_bar/with_top_level_warnings_spec.rb'
     - 'spec/lib/gitlab/performance_bar_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/cache/map_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/client_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/project_creator_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/representation/task_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/representation/user_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/user_finder_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/worker_state_spec.rb'
     - 'spec/lib/gitlab/pipeline_scope_counts_spec.rb'
     - 'spec/lib/gitlab/polling_interval_spec.rb'
     - 'spec/lib/gitlab/popen/runner_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 76a296e97fd..e72c47c45a6 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -669,9 +669,6 @@ RSpec/VerifiedDoubles:
     - 'spec/lib/gitlab/pagination/offset_header_builder_spec.rb'
     - 'spec/lib/gitlab/pagination/offset_pagination_spec.rb'
     - 'spec/lib/gitlab/performance_bar/stats_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/user_spec.rb'
     - 'spec/lib/gitlab/polling_interval_spec.rb'
     - 'spec/lib/gitlab/popen/runner_spec.rb'
     - 'spec/lib/gitlab/process_management_spec.rb'
diff --git a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
index efd7db7ad2c..2f208c080c3 100644
--- a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
+++ b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
@@ -135,7 +135,6 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'app/workers/gitlab/jira_import/advance_stage_worker.rb'
     - 'app/workers/gitlab/jira_import/import_issue_worker.rb'
     - 'app/workers/gitlab/jira_import/stage/start_import_worker.rb'
-    - 'app/workers/gitlab/phabricator_import/import_tasks_worker.rb'
     - 'app/workers/gitlab_performance_bar_stats_worker.rb'
     - 'app/workers/gitlab_service_ping_worker.rb'
     - 'app/workers/gitlab_shell_worker.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index 27ceead3555..2c5aeba13b3 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -90,7 +90,6 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/import/gitlab_projects_controller.rb'
     - 'app/controllers/import/history_controller.rb'
     - 'app/controllers/import/manifest_controller.rb'
-    - 'app/controllers/import/phabricator_controller.rb'
     - 'app/controllers/import/url_controller.rb'
     - 'app/controllers/jira_connect/app_descriptor_controller.rb'
     - 'app/controllers/jira_connect/application_controller.rb'
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index 153603eed5b..f8a033317c1 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -21,7 +21,6 @@ Style/EmptyMethod:
     - 'app/controllers/import/bitbucket_server_controller.rb'
     - 'app/controllers/import/fogbugz_controller.rb'
     - 'app/controllers/import/manifest_controller.rb'
-    - 'app/controllers/import/phabricator_controller.rb'
     - 'app/controllers/profiles/chat_names_controller.rb'
     - 'app/controllers/profiles/passwords_controller.rb'
     - 'app/controllers/profiles/preferences_controller.rb'