From 7d4e6bdbfb58ceb32fafade92c07b8d9bf845466 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 29 Jun 2022 03:08:18 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/hash_alignment.yml | 3 - .../multiline_operation_indentation.yml | 1 - .../layout/space_in_lambda_literal.yml | 2 - .../layout/space_inside_block_braces.yml | 7 - .rubocop_todo/layout/space_inside_parens.yml | 7 - .../lint/redundant_cop_disable_directive.yml | 2 - .../background_migration_base_class.yml | 1 - .../rescued_exceptions_variable_name.yml | 4 - .rubocop_todo/rails/file_path.yml | 1 - .../rails/helper_instance_variable.yml | 1 - .../rails/skips_model_validations.yml | 1 - .rubocop_todo/rspec/any_instance_of.yml | 2 - .rubocop_todo/rspec/context_wording.yml | 20 - .rubocop_todo/rspec/expect_change.yml | 4 - .rubocop_todo/rspec/expect_in_hook.yml | 4 - .rubocop_todo/rspec/instance_variable.yml | 1 - .rubocop_todo/rspec/predicate_matcher.yml | 7 - .rubocop_todo/rspec/return_from_stub.yml | 5 - .rubocop_todo/rspec/scattered_let.yml | 1 - .../components/table/cells/actions_cell.vue | 2 +- .../header/pipeline_editor_mini_graph.vue | 29 +- .../components/header/pipeline_status.vue | 2 +- .../components/jobs/failed_jobs_table.vue | 2 +- .../pipelines_list/pipeline_mini_graph.vue | 94 +--- .../pipelines_list/pipeline_operations.vue | 2 +- .../pipelines_list/pipeline_stages.vue | 54 --- .../pipelines_list/pipelines_table.vue | 33 +- .../commit_box_pipeline_mini_graph.vue | 36 +- .../components/mr_widget_pipeline.vue | 24 +- .../page_bundles/merge_requests.scss | 6 + app/assets/stylesheets/pages/commits.scss | 6 + app/views/projects/ci/builds/_build.html.haml | 2 +- doc/api/graphql/reference/index.md | 8 +- .../reducing_the_repo_size_using_git.md | 2 +- .../commit/mini_pipeline_graph_spec.rb | 2 +- .../commit_box_pipeline_mini_graph_spec.js | 16 +- .../header/pipeline_editor_mini_graph_spec.js | 109 ----- ...es_spec.js => pipeline_mini_graph_spec.js} | 6 +- .../pipelines/linked_pipelines_mock_data.js | 407 ------------------ .../pipelines/pipeline_mini_graph_spec.js | 149 ------- .../pipelines/pipelines_table_spec.js | 20 +- .../components/mr_widget_pipeline_spec.js | 20 +- 42 files changed, 170 insertions(+), 935 deletions(-) delete mode 100644 app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue delete mode 100644 spec/frontend/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js rename spec/frontend/pipelines/components/pipelines_list/{pipeline_stages_spec.js => pipeline_mini_graph_spec.js} (92%) delete mode 100644 spec/frontend/pipelines/linked_pipelines_mock_data.js delete mode 100644 spec/frontend/pipelines/pipeline_mini_graph_spec.js diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml index 2125c032437..2796d4dec4a 100644 --- a/.rubocop_todo/layout/hash_alignment.yml +++ b/.rubocop_todo/layout/hash_alignment.yml @@ -382,7 +382,6 @@ Layout/HashAlignment: - 'ee/lib/gitlab/ci/parsers/security/formatters/dependency_list.rb' - 'ee/lib/gitlab/elastic/helper.rb' - 'ee/lib/gitlab/elastic/indexer.rb' - - 'ee/lib/gitlab/geo/replication/base_transfer.rb' - 'ee/spec/controllers/ee/projects/variables_controller_spec.rb' - 'ee/spec/controllers/groups/epic_boards_controller_spec.rb' - 'ee/spec/controllers/groups/issues_controller_spec.rb' @@ -610,7 +609,6 @@ Layout/HashAlignment: - 'spec/lib/gitlab/etag_caching/router/graphql_spec.rb' - 'spec/lib/gitlab/git/repository_spec.rb' - 'spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb' - - 'spec/lib/gitlab/hook_data/issuable_builder_spec.rb' - 'spec/lib/gitlab/import_export/attributes_finder_spec.rb' - 'spec/lib/gitlab/import_export/group/object_builder_spec.rb' - 'spec/lib/gitlab/import_export/group/relation_tree_restorer_spec.rb' @@ -688,7 +686,6 @@ Layout/HashAlignment: - 'spec/services/ci/create_pipeline_service/logger_spec.rb' - 'spec/services/ci/create_pipeline_service/tags_spec.rb' - 'spec/services/ci/job_artifacts/create_service_spec.rb' - - 'spec/services/ci/retry_build_service_spec.rb' - 'spec/services/deployments/link_merge_requests_service_spec.rb' - 'spec/services/discussions/capture_diff_note_positions_service_spec.rb' - 'spec/services/groups/import_export/import_service_spec.rb' diff --git a/.rubocop_todo/layout/multiline_operation_indentation.yml b/.rubocop_todo/layout/multiline_operation_indentation.yml index 0f2404ee3cc..a00d759482a 100644 --- a/.rubocop_todo/layout/multiline_operation_indentation.yml +++ b/.rubocop_todo/layout/multiline_operation_indentation.yml @@ -96,7 +96,6 @@ Layout/MultilineOperationIndentation: - 'qa/qa/page/component/snippet.rb' - 'qa/qa/runtime/api/repository_storage_moves.rb' - 'rubocop/cop/gitlab/keys_first_and_values_first.rb' - - 'rubocop/cop/migration/hash_index.rb' - 'rubocop/migration_helpers.rb' - 'spec/frontend/fixtures/tabs.rb' - 'spec/lib/gitlab/ci/pipeline/seed/build_spec.rb' diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index e633f51209d..c88fdf5a3b0 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -141,7 +141,6 @@ Layout/SpaceInLambdaLiteral: - 'app/serializers/concerns/user_status_tooltip.rb' - 'app/serializers/container_repository_entity.rb' - 'app/serializers/container_tag_entity.rb' - - 'app/serializers/deploy_key_entity.rb' - 'app/serializers/deployment_cluster_entity.rb' - 'app/serializers/deployment_entity.rb' - 'app/serializers/detailed_status_entity.rb' @@ -276,7 +275,6 @@ Layout/SpaceInLambdaLiteral: - 'ee/app/serializers/epic_entity.rb' - 'ee/app/serializers/epic_note_entity.rb' - 'ee/app/serializers/linked_epic_issue_entity.rb' - - 'ee/app/serializers/merge_request_compliance_entity.rb' - 'ee/app/serializers/metrics_report_metric_entity.rb' - 'ee/app/serializers/vulnerabilities/feedback_entity.rb' - 'ee/app/serializers/vulnerabilities/finding_entity.rb' diff --git a/.rubocop_todo/layout/space_inside_block_braces.yml b/.rubocop_todo/layout/space_inside_block_braces.yml index 961b27f26e7..930cf37d0f8 100644 --- a/.rubocop_todo/layout/space_inside_block_braces.yml +++ b/.rubocop_todo/layout/space_inside_block_braces.yml @@ -11,7 +11,6 @@ Layout/SpaceInsideBlockBraces: - 'app/controllers/projects/boards_controller.rb' - 'app/experiments/security_reports_mr_widget_prompt_experiment.rb' - 'app/experiments/video_tutorials_continuous_onboarding_experiment.rb' - - 'app/graphql/types/concerns/find_closest.rb' - 'app/helpers/favicon_helper.rb' - 'app/helpers/time_zone_helper.rb' - 'app/helpers/todos_helper.rb' @@ -245,7 +244,6 @@ Layout/SpaceInsideBlockBraces: - 'ee/spec/support/shared_examples/services/boards/base_service_shared_examples.rb' - 'ee/spec/support/shared_examples/services/search_notes_shared_examples.rb' - 'ee/spec/tasks/gitlab/elastic_rake_spec.rb' - - 'ee/spec/uploaders/every_gitlab_uploader_spec.rb' - 'ee/spec/views/registrations/groups_projects/new.html.haml_spec.rb' - 'ee/spec/views/shared/billings/_eoa_bronze_plan_banner.html.haml_spec.rb' - 'ee/spec/views/shared/credentials_inventory/_expiry_date.html.haml_spec.rb' @@ -378,9 +376,7 @@ Layout/SpaceInsideBlockBraces: - 'spec/frontend/fixtures/pipeline_schedules.rb' - 'spec/frontend/fixtures/pipelines.rb' - 'spec/frontend/fixtures/projects.rb' - - 'spec/frontend/fixtures/prometheus_service.rb' - 'spec/frontend/fixtures/raw.rb' - - 'spec/frontend/fixtures/services.rb' - 'spec/frontend/fixtures/snippet.rb' - 'spec/frontend/fixtures/todos.rb' - 'spec/graphql/mutations/merge_requests/set_labels_spec.rb' @@ -604,7 +600,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/presenters/packages/composer/packages_presenter_spec.rb' - 'spec/presenters/packages/conan/package_presenter_spec.rb' - 'spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb' - - 'spec/presenters/packages/pypi/package_presenter_spec.rb' - 'spec/presenters/project_presenter_spec.rb' - 'spec/requests/api/branches_spec.rb' - 'spec/requests/api/ci/jobs_spec.rb' @@ -659,7 +654,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/requests/oauth/tokens_controller_spec.rb' - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb' - 'spec/serializers/cluster_entity_spec.rb' - - 'spec/serializers/deploy_key_entity_spec.rb' - 'spec/serializers/import/provider_repo_serializer_spec.rb' - 'spec/services/auto_merge/base_service_spec.rb' - 'spec/services/auto_merge_service_spec.rb' @@ -762,4 +756,3 @@ Layout/SpaceInsideBlockBraces: - 'spec/workers/pages_worker_spec.rb' - 'spec/workers/purge_dependency_proxy_cache_worker_spec.rb' - 'spec/workers/releases/manage_evidence_worker_spec.rb' - - 'spec/workers/repository_remove_remote_worker_spec.rb' diff --git a/.rubocop_todo/layout/space_inside_parens.yml b/.rubocop_todo/layout/space_inside_parens.yml index 9022d41aeeb..14a5fffa417 100644 --- a/.rubocop_todo/layout/space_inside_parens.yml +++ b/.rubocop_todo/layout/space_inside_parens.yml @@ -71,7 +71,6 @@ Layout/SpaceInsideParens: - 'ee/spec/features/merge_requests/user_resets_approvers_spec.rb' - 'ee/spec/features/merge_requests/user_views_all_merge_requests_spec.rb' - 'ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb' - - 'ee/spec/finders/ee/alert_management/alerts_finder_spec.rb' - 'ee/spec/finders/ee/alert_management/http_integrations_finder_spec.rb' - 'ee/spec/finders/epics_finder_spec.rb' - 'ee/spec/finders/security/pipeline_vulnerabilities_finder_spec.rb' @@ -89,7 +88,6 @@ Layout/SpaceInsideParens: - 'ee/spec/lib/gitlab/auth/group_saml/group_lookup_spec.rb' - 'ee/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb' - 'ee/spec/lib/gitlab/auth/smartcard/ldap_certificate_spec.rb' - - 'ee/spec/lib/gitlab/auth_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/coverage_fuzzing_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/dast_api_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/dast_api_latest_gitlab_ci_yaml_spec.rb' @@ -228,9 +226,7 @@ Layout/SpaceInsideParens: - 'spec/frontend/fixtures/pipeline_schedules.rb' - 'spec/frontend/fixtures/pipelines.rb' - 'spec/frontend/fixtures/projects.rb' - - 'spec/frontend/fixtures/prometheus_service.rb' - 'spec/frontend/fixtures/raw.rb' - - 'spec/frontend/fixtures/services.rb' - 'spec/frontend/fixtures/snippet.rb' - 'spec/frontend/fixtures/todos.rb' - 'spec/graphql/mutations/todos/restore_many_spec.rb' @@ -281,7 +277,6 @@ Layout/SpaceInsideParens: - 'spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/flutter_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/kaniko_gitlab_ci_yaml_spec.rb' - - 'spec/lib/gitlab/ci/templates/managed_cluster_applications_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/npm_spec.rb' - 'spec/lib/gitlab/ci/templates/terraform_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/terraform_latest_gitlab_ci_yaml_spec.rb' @@ -387,8 +382,6 @@ Layout/SpaceInsideParens: - 'spec/requests/search_controller_spec.rb' - 'spec/serializers/analytics_build_entity_spec.rb' - 'spec/serializers/merge_request_user_entity_spec.rb' - - 'spec/services/authorized_project_update/project_create_service_spec.rb' - - 'spec/services/authorized_project_update/project_group_link_create_service_spec.rb' - 'spec/services/boards/issues/list_service_spec.rb' - 'spec/services/ci/compare_test_reports_service_spec.rb' - 'spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb' diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml index d058e23109b..e4925aa2cfd 100644 --- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml +++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml @@ -44,7 +44,6 @@ Lint/RedundantCopDisableDirective: - 'app/workers/bulk_imports/entity_worker.rb' - 'app/workers/container_expiration_policy_worker.rb' - 'app/workers/create_note_diff_file_worker.rb' - - 'app/workers/expire_job_cache_worker.rb' - 'app/workers/import_issues_csv_worker.rb' - 'app/workers/incident_management/process_alert_worker_v2.rb' - 'app/workers/merge_worker.rb' @@ -152,7 +151,6 @@ Lint/RedundantCopDisableDirective: - 'lib/gitlab/profiler.rb' - 'lib/gitlab/project_search_results.rb' - 'lib/gitlab/redis/hll.rb' - - 'lib/gitlab/request_profiler.rb' - 'lib/gitlab/slash_commands/issue_search.rb' - 'lib/gitlab/usage_data.rb' - 'lib/gitlab/usage_data_queries.rb' diff --git a/.rubocop_todo/migration/background_migration_base_class.yml b/.rubocop_todo/migration/background_migration_base_class.yml index f026ec19c7b..495b4a51e56 100644 --- a/.rubocop_todo/migration/background_migration_base_class.yml +++ b/.rubocop_todo/migration/background_migration_base_class.yml @@ -57,7 +57,6 @@ Migration/BackgroundMigrationBaseClass: - 'lib/gitlab/background_migration/migrate_project_taggings_context_from_tags_to_topics.rb' - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb' - 'lib/gitlab/background_migration/migrate_shimo_confluence_integration_category.rb' - - 'lib/gitlab/background_migration/migrate_stage_status.rb' - 'lib/gitlab/background_migration/migrate_u2f_webauthn.rb' - 'lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb' - 'lib/gitlab/background_migration/nullify_orphan_runner_id_on_ci_builds.rb' diff --git a/.rubocop_todo/naming/rescued_exceptions_variable_name.yml b/.rubocop_todo/naming/rescued_exceptions_variable_name.yml index 0e753a53dc3..f6416bed902 100644 --- a/.rubocop_todo/naming/rescued_exceptions_variable_name.yml +++ b/.rubocop_todo/naming/rescued_exceptions_variable_name.yml @@ -116,9 +116,6 @@ Naming/RescuedExceptionsVariableName: - 'ee/app/services/geo/repository_base_sync_service.rb' - 'ee/app/services/incident_management/oncall_rotations/create_service.rb' - 'ee/app/services/incident_management/oncall_rotations/edit_service.rb' - - 'ee/app/services/namespaces/deactivate_members_over_limit_service.rb' - - 'ee/app/services/namespaces/remove_project_group_links_outside_hierarchy_service.rb' - - 'ee/app/services/namespaces/update_prevent_sharing_outside_hierarchy_service.rb' - 'ee/app/services/projects/licenses/create_policy_service.rb' - 'ee/app/services/projects/licenses/update_policy_service.rb' - 'ee/app/services/security/ingestion/ingest_report_service.rb' @@ -132,7 +129,6 @@ Naming/RescuedExceptionsVariableName: - 'ee/app/workers/geo/file_removal_worker.rb' - 'ee/app/workers/geo/repositories_clean_up_worker.rb' - 'ee/app/workers/geo/scheduler/scheduler_worker.rb' - - 'ee/app/workers/namespaces/free_user_cap_worker.rb' - 'ee/app/workers/refresh_license_compliance_checks_worker.rb' - 'ee/app/workers/repository_update_mirror_worker.rb' - 'ee/app/workers/sync_seat_link_request_worker.rb' diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml index 1c442dcdec7..10e82ea44ae 100644 --- a/.rubocop_todo/rails/file_path.yml +++ b/.rubocop_todo/rails/file_path.yml @@ -103,7 +103,6 @@ Rails/FilePath: - 'spec/features/projects/snippets/create_snippet_spec.rb' - 'spec/features/projects/tags/user_edits_tags_spec.rb' - 'spec/features/projects/tree/upload_file_spec.rb' - - 'spec/features/refactor_blob_viewer_disabled/projects/files/user_replaces_files_spec.rb' - 'spec/features/snippets/user_creates_snippet_spec.rb' - 'spec/features/snippets/user_edits_snippet_spec.rb' - 'spec/features/uploads/user_uploads_avatar_to_group_spec.rb' diff --git a/.rubocop_todo/rails/helper_instance_variable.yml b/.rubocop_todo/rails/helper_instance_variable.yml index 8a1a6093c3d..aeed8875f20 100644 --- a/.rubocop_todo/rails/helper_instance_variable.yml +++ b/.rubocop_todo/rails/helper_instance_variable.yml @@ -82,4 +82,3 @@ Rails/HelperInstanceVariable: - 'ee/app/helpers/ee/wiki_helper.rb' - 'ee/app/helpers/path_locks_helper.rb' - 'ee/app/helpers/projects/security/discover_helper.rb' - - 'ee/app/helpers/seats_count_alert_helper.rb' diff --git a/.rubocop_todo/rails/skips_model_validations.yml b/.rubocop_todo/rails/skips_model_validations.yml index 75a0d49862e..985f098b659 100644 --- a/.rubocop_todo/rails/skips_model_validations.yml +++ b/.rubocop_todo/rails/skips_model_validations.yml @@ -544,7 +544,6 @@ Rails/SkipsModelValidations: - 'spec/lib/gitlab/middleware/go_spec.rb' - 'spec/lib/gitlab/middleware/query_analyzer_spec.rb' - 'spec/lib/gitlab/object_hierarchy_spec.rb' - - 'spec/lib/gitlab/pages_transfer_spec.rb' - 'spec/lib/gitlab/sidekiq_middleware/query_analyzer_spec.rb' - 'spec/lib/sidebars/projects/menus/project_information_menu_spec.rb' - 'spec/mailers/notify_spec.rb' diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml index 399d1751687..4df0f8fbbc5 100644 --- a/.rubocop_todo/rspec/any_instance_of.yml +++ b/.rubocop_todo/rspec/any_instance_of.yml @@ -347,7 +347,6 @@ RSpec/AnyInstanceOf: - spec/services/ci/list_config_variables_service_spec.rb - spec/services/ci/register_job_service_spec.rb - spec/services/ci/resource_groups/assign_resource_from_resource_group_service_spec.rb - - spec/services/ci/retry_build_service_spec.rb - spec/services/ci/retry_pipeline_service_spec.rb - spec/services/ci/stop_environments_service_spec.rb - spec/services/clusters/applications/create_service_spec.rb @@ -481,7 +480,6 @@ RSpec/AnyInstanceOf: - spec/workers/email_receiver_worker_spec.rb - spec/workers/emails_on_push_worker_spec.rb - spec/workers/error_tracking_issue_link_worker_spec.rb - - spec/workers/expire_pipeline_cache_worker_spec.rb - spec/workers/group_export_worker_spec.rb - spec/workers/group_import_worker_spec.rb - spec/workers/namespaces/root_statistics_worker_spec.rb diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index ee9af62fd78..0d517c6cd55 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -233,7 +233,6 @@ RSpec/ContextWording: - 'ee/spec/finders/dast_scanner_profiles_finder_spec.rb' - 'ee/spec/finders/dast_site_profiles_finder_spec.rb' - 'ee/spec/finders/dast_site_validations_finder_spec.rb' - - 'ee/spec/finders/ee/alert_management/alerts_finder_spec.rb' - 'ee/spec/finders/ee/alert_management/http_integrations_finder_spec.rb' - 'ee/spec/finders/ee/clusters/agent_authorizations_finder_spec.rb' - 'ee/spec/finders/ee/group_members_finder_spec.rb' @@ -487,11 +486,6 @@ RSpec/ContextWording: - 'ee/spec/lib/gitlab/geo/log_helpers_spec.rb' - 'ee/spec/lib/gitlab/geo/oauth/session_spec.rb' - 'ee/spec/lib/gitlab/geo/replication/blob_downloader_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/file_downloader_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/file_retriever_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/file_transfer_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/job_artifact_downloader_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/job_artifact_transfer_spec.rb' - 'ee/spec/lib/gitlab/geo/replicator_spec.rb' - 'ee/spec/lib/gitlab/geo/signed_data_spec.rb' - 'ee/spec/lib/gitlab/geo_spec.rb' @@ -908,8 +902,6 @@ RSpec/ContextWording: - 'ee/spec/services/ee/protected_branches/create_service_spec.rb' - 'ee/spec/services/ee/quick_actions/target_service_spec.rb' - 'ee/spec/services/ee/resource_events/merge_into_notes_service_spec.rb' - - 'ee/spec/services/ee/service_ping/build_payload_service_spec.rb' - - 'ee/spec/services/ee/service_ping/permit_data_categories_service_spec.rb' - 'ee/spec/services/ee/users/build_service_spec.rb' - 'ee/spec/services/ee/users/create_service_spec.rb' - 'ee/spec/services/ee/users/destroy_service_spec.rb' @@ -936,9 +928,7 @@ RSpec/ContextWording: - 'ee/spec/services/geo/container_repository_sync_service_spec.rb' - 'ee/spec/services/geo/container_repository_sync_spec.rb' - 'ee/spec/services/geo/design_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/file_download_service_spec.rb' - 'ee/spec/services/geo/file_registry_removal_service_spec.rb' - - 'ee/spec/services/geo/file_upload_service_spec.rb' - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb' - 'ee/spec/services/geo/hashed_storage_migration_service_spec.rb' - 'ee/spec/services/geo/move_repository_service_spec.rb' @@ -1113,7 +1103,6 @@ RSpec/ContextWording: - 'ee/spec/tasks/gitlab/elastic_rake_spec.rb' - 'ee/spec/tasks/gitlab/license_rake_spec.rb' - 'ee/spec/tasks/gitlab/uploads/migrate_rake_spec.rb' - - 'ee/spec/uploaders/every_gitlab_uploader_spec.rb' - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb' - 'ee/spec/views/admin/users/show.html.haml_spec.rb' - 'ee/spec/views/compliance_management/compliance_framework/_project_settings.html.haml_spec.rb' @@ -1160,7 +1149,6 @@ RSpec/ContextWording: - 'ee/spec/workers/elastic_index_bulk_cron_worker_spec.rb' - 'ee/spec/workers/elastic_indexing_control_worker_spec.rb' - 'ee/spec/workers/geo/create_repository_updated_event_worker_spec.rb' - - 'ee/spec/workers/geo/file_download_dispatch_worker_spec.rb' - 'ee/spec/workers/geo/prune_event_log_worker_spec.rb' - 'ee/spec/workers/geo/repository_shard_sync_worker_spec.rb' - 'ee/spec/workers/geo/repository_sync_worker_spec.rb' @@ -1178,7 +1166,6 @@ RSpec/ContextWording: - 'ee/spec/workers/post_receive_spec.rb' - 'ee/spec/workers/project_import_schedule_worker_spec.rb' - 'ee/spec/workers/requirements_management/process_requirements_reports_worker_spec.rb' - - 'ee/spec/workers/security/generate_scan_finding_rules_worker_spec.rb' - 'ee/spec/workers/security/track_secure_scans_worker_spec.rb' - 'ee/spec/workers/store_security_reports_worker_spec.rb' - 'ee/spec/workers/sync_seat_link_request_worker_spec.rb' @@ -2239,7 +2226,6 @@ RSpec/ContextWording: - 'spec/lib/gitlab/database_spec.rb' - 'spec/lib/gitlab/default_branch_spec.rb' - 'spec/lib/gitlab/deploy_key_access_spec.rb' - - 'spec/lib/gitlab/diff/custom_diff_spec.rb' - 'spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb' - 'spec/lib/gitlab/diff/file_spec.rb' - 'spec/lib/gitlab/diff/formatters/text_formatter_spec.rb' @@ -2894,7 +2880,6 @@ RSpec/ContextWording: - 'spec/presenters/packages/conan/package_presenter_spec.rb' - 'spec/presenters/packages/npm/package_presenter_spec.rb' - 'spec/presenters/packages/nuget/service_index_presenter_spec.rb' - - 'spec/presenters/packages/pypi/package_presenter_spec.rb' - 'spec/presenters/project_member_presenter_spec.rb' - 'spec/presenters/project_presenter_spec.rb' - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb' @@ -3168,7 +3153,6 @@ RSpec/ContextWording: - 'spec/serializers/cluster_application_entity_spec.rb' - 'spec/serializers/cluster_entity_spec.rb' - 'spec/serializers/context_commits_diff_entity_spec.rb' - - 'spec/serializers/deploy_key_entity_spec.rb' - 'spec/serializers/diff_file_base_entity_spec.rb' - 'spec/serializers/diff_file_entity_spec.rb' - 'spec/serializers/diff_file_metadata_entity_spec.rb' @@ -3483,7 +3467,6 @@ RSpec/ContextWording: - 'spec/services/projects/update_remote_mirror_service_spec.rb' - 'spec/services/projects/update_repository_storage_service_spec.rb' - 'spec/services/projects/update_service_spec.rb' - - 'spec/services/prometheus/create_default_alerts_service_spec.rb' - 'spec/services/prometheus/proxy_service_spec.rb' - 'spec/services/prometheus/proxy_variable_substitution_service_spec.rb' - 'spec/services/protected_tags/create_service_spec.rb' @@ -3883,11 +3866,9 @@ RSpec/ContextWording: - 'spec/workers/deployments/update_environment_worker_spec.rb' - 'spec/workers/design_management/new_version_worker_spec.rb' - 'spec/workers/every_sidekiq_worker_spec.rb' - - 'spec/workers/expire_build_instance_artifacts_worker_spec.rb' - 'spec/workers/group_import_worker_spec.rb' - 'spec/workers/incident_management/process_alert_worker_v2_spec.rb' - 'spec/workers/integrations/create_external_cross_reference_worker_spec.rb' - - 'spec/workers/issue_placement_worker_spec.rb' - 'spec/workers/issues/placement_worker_spec.rb' - 'spec/workers/merge_requests/delete_source_branch_worker_spec.rb' - 'spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb' @@ -3902,7 +3883,6 @@ RSpec/ContextWording: - 'spec/workers/projects/git_garbage_collect_worker_spec.rb' - 'spec/workers/projects/post_creation_worker_spec.rb' - 'spec/workers/projects/refresh_build_artifacts_size_statistics_worker_spec.rb' - - 'spec/workers/prometheus/create_default_alerts_worker_spec.rb' - 'spec/workers/purge_dependency_proxy_cache_worker_spec.rb' - 'spec/workers/remove_expired_group_links_worker_spec.rb' - 'spec/workers/remove_expired_members_worker_spec.rb' diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml index 3b4d463ad69..02320f07c53 100644 --- a/.rubocop_todo/rspec/expect_change.yml +++ b/.rubocop_todo/rspec/expect_change.yml @@ -181,7 +181,6 @@ RSpec/ExpectChange: - 'ee/spec/services/external_status_checks/destroy_service_spec.rb' - 'ee/spec/services/external_status_checks/update_service_spec.rb' - 'ee/spec/services/geo/blob_download_service_spec.rb' - - 'ee/spec/services/geo/file_download_service_spec.rb' - 'ee/spec/services/geo/metrics_update_service_spec.rb' - 'ee/spec/services/geo/project_housekeeping_service_spec.rb' - 'ee/spec/services/geo/registry_consistency_service_spec.rb' @@ -190,7 +189,6 @@ RSpec/ExpectChange: - 'ee/spec/services/group_saml/identity/destroy_service_spec.rb' - 'ee/spec/services/group_saml/sign_up_service_spec.rb' - 'ee/spec/services/groups/mark_for_deletion_service_spec.rb' - - 'ee/spec/services/groups/recent_merge_requests_count_service_spec.rb' - 'ee/spec/services/groups/restore_service_spec.rb' - 'ee/spec/services/groups/sync_service_spec.rb' - 'ee/spec/services/incident_management/oncall_rotations/edit_service_spec.rb' @@ -201,7 +199,6 @@ RSpec/ExpectChange: - 'ee/spec/services/lfs/unlock_file_service_spec.rb' - 'ee/spec/services/merge_request_approval_settings/update_service_spec.rb' - 'ee/spec/services/merge_requests/update_blocks_service_spec.rb' - - 'ee/spec/services/namespaces/update_prevent_sharing_outside_hierarchy_service_spec.rb' - 'ee/spec/services/projects/import_service_spec.rb' - 'ee/spec/services/projects/mark_for_deletion_service_spec.rb' - 'ee/spec/services/projects/restore_service_spec.rb' @@ -242,7 +239,6 @@ RSpec/ExpectChange: - 'ee/spec/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker_spec.rb' - 'ee/spec/workers/geo/verification_state_backfill_service_spec.rb' - 'ee/spec/workers/new_epic_worker_spec.rb' - - 'ee/spec/workers/security/generate_scan_finding_rules_worker_spec.rb' - 'ee/spec/workers/store_security_reports_worker_spec.rb' - 'spec/controllers/admin/clusters_controller_spec.rb' - 'spec/controllers/admin/groups_controller_spec.rb' diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml index 58985c35227..63e2b2f0ed3 100644 --- a/.rubocop_todo/rspec/expect_in_hook.yml +++ b/.rubocop_todo/rspec/expect_in_hook.yml @@ -42,7 +42,6 @@ RSpec/ExpectInHook: - 'ee/spec/lib/gitlab/ci/minutes/cost_factor_spec.rb' - 'ee/spec/lib/gitlab/code_owners/validator_spec.rb' - 'ee/spec/lib/gitlab/code_owners_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/job_artifact_retriever_spec.rb' - 'ee/spec/lib/gitlab/geo_spec.rb' - 'ee/spec/lib/gitlab/git_access_spec.rb' - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb' @@ -448,7 +447,6 @@ RSpec/ExpectInHook: - 'spec/services/packages/update_package_file_service_spec.rb' - 'spec/services/pages/zip_directory_service_spec.rb' - 'spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb' - - 'spec/services/projects/after_import_service_spec.rb' - 'spec/services/projects/after_rename_service_spec.rb' - 'spec/services/projects/branches_by_mode_service_spec.rb' - 'spec/services/projects/container_repository/cleanup_tags_service_spec.rb' @@ -456,7 +454,6 @@ RSpec/ExpectInHook: - 'spec/services/projects/container_repository/gitlab/delete_tags_service_spec.rb' - 'spec/services/projects/container_repository/third_party/delete_tags_service_spec.rb' - 'spec/services/projects/create_from_template_service_spec.rb' - - 'spec/services/projects/destroy_rollback_service_spec.rb' - 'spec/services/projects/destroy_service_spec.rb' - 'spec/services/projects/import_export/export_service_spec.rb' - 'spec/services/projects/import_service_spec.rb' @@ -471,7 +468,6 @@ RSpec/ExpectInHook: - 'spec/services/protected_branches/create_service_spec.rb' - 'spec/services/protected_branches/destroy_service_spec.rb' - 'spec/services/protected_branches/update_service_spec.rb' - - 'spec/services/repositories/destroy_rollback_service_spec.rb' - 'spec/services/repositories/destroy_service_spec.rb' - 'spec/services/search_service_spec.rb' - 'spec/services/serverless/associate_domain_service_spec.rb' diff --git a/.rubocop_todo/rspec/instance_variable.yml b/.rubocop_todo/rspec/instance_variable.yml index 7489aca5b51..97ed3a7c48d 100644 --- a/.rubocop_todo/rspec/instance_variable.yml +++ b/.rubocop_todo/rspec/instance_variable.yml @@ -72,7 +72,6 @@ RSpec/InstanceVariable: - qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb - qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb - qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb - - qa/qa/specs/features/ee/browser_ui/4_verify/cancelling_merge_request_in_merge_train_spec.rb - qa/spec/support/repeater_spec.rb - spec/commands/metrics_server/metrics_server_spec.rb - spec/controllers/admin/clusters_controller_spec.rb diff --git a/.rubocop_todo/rspec/predicate_matcher.yml b/.rubocop_todo/rspec/predicate_matcher.yml index ebd11aeb449..c6a75708ae8 100644 --- a/.rubocop_todo/rspec/predicate_matcher.yml +++ b/.rubocop_todo/rspec/predicate_matcher.yml @@ -32,8 +32,6 @@ RSpec/PredicateMatcher: - 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb' - 'ee/spec/lib/gitlab/geo/geo_node_status_check_spec.rb' - 'ee/spec/lib/gitlab/geo/jwt_request_decoder_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/base_transfer_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/file_transfer_spec.rb' - 'ee/spec/lib/gitlab/geo/replicator_spec.rb' - 'ee/spec/lib/gitlab/geo_spec.rb' - 'ee/spec/lib/gitlab/mirror_spec.rb' @@ -72,7 +70,6 @@ RSpec/PredicateMatcher: - 'ee/spec/models/project_spec.rb' - 'ee/spec/models/saml_provider_spec.rb' - 'ee/spec/models/security/orchestration_policy_configuration_spec.rb' - - 'ee/spec/presenters/ci/minutes/quota_presenter_spec.rb' - 'ee/spec/requests/api/boards_spec.rb' - 'ee/spec/requests/api/graphql/mutations/epics/set_subscription_spec.rb' - 'ee/spec/requests/api/groups_spec.rb' @@ -250,7 +247,6 @@ RSpec/PredicateMatcher: - 'spec/lib/gitlab/dependency_linker/podspec_linker_spec.rb' - 'spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb' - 'spec/lib/gitlab/deploy_key_access_spec.rb' - - 'spec/lib/gitlab/diff/custom_diff_spec.rb' - 'spec/lib/gitlab/diff/file_spec.rb' - 'spec/lib/gitlab/diff/position_spec.rb' - 'spec/lib/gitlab/diff/rendered/notebook/diff_file_spec.rb' @@ -458,7 +454,6 @@ RSpec/PredicateMatcher: - 'spec/services/projects/after_rename_service_spec.rb' - 'spec/services/projects/cleanup_service_spec.rb' - 'spec/services/projects/create_service_spec.rb' - - 'spec/services/projects/destroy_rollback_service_spec.rb' - 'spec/services/projects/destroy_service_spec.rb' - 'spec/services/projects/fork_service_spec.rb' - 'spec/services/projects/hashed_storage/base_attachment_service_spec.rb' @@ -471,7 +466,6 @@ RSpec/PredicateMatcher: - 'spec/services/projects/update_pages_service_spec.rb' - 'spec/services/projects/update_service_spec.rb' - 'spec/services/releases/create_service_spec.rb' - - 'spec/services/repositories/destroy_rollback_service_spec.rb' - 'spec/services/repositories/destroy_service_spec.rb' - 'spec/services/repository_archive_clean_up_service_spec.rb' - 'spec/services/resource_access_tokens/revoke_service_spec.rb' @@ -506,7 +500,6 @@ RSpec/PredicateMatcher: - 'spec/workers/ci/delete_objects_worker_spec.rb' - 'spec/workers/concerns/worker_attributes_spec.rb' - 'spec/workers/container_expiration_policies/cleanup_container_repository_worker_spec.rb' - - 'spec/workers/expire_build_instance_artifacts_worker_spec.rb' - 'spec/workers/group_destroy_worker_spec.rb' - 'spec/workers/hashed_storage/migrator_worker_spec.rb' - 'spec/workers/hashed_storage/rollbacker_worker_spec.rb' diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml index 2fb01b855be..fb82a9431a4 100644 --- a/.rubocop_todo/rspec/return_from_stub.yml +++ b/.rubocop_todo/rspec/return_from_stub.yml @@ -45,8 +45,6 @@ RSpec/ReturnFromStub: - 'ee/spec/lib/gitlab/code_owners_spec.rb' - 'ee/spec/lib/gitlab/geo/health_check_spec.rb' - 'ee/spec/lib/gitlab/geo/logger_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/base_transfer_spec.rb' - - 'ee/spec/lib/gitlab/geo/replication/file_transfer_spec.rb' - 'ee/spec/lib/gitlab/geo_spec.rb' - 'ee/spec/lib/gitlab/git_access_spec.rb' - 'ee/spec/lib/gitlab/git_access_wiki_spec.rb' @@ -71,7 +69,6 @@ RSpec/ReturnFromStub: - 'ee/spec/services/geo/design_repository_sync_service_spec.rb' - 'ee/spec/services/geo/files_expire_service_spec.rb' - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/job_artifact_deleted_event_store_spec.rb' - 'ee/spec/services/geo/project_housekeeping_service_spec.rb' - 'ee/spec/services/geo/repository_base_sync_service_spec.rb' - 'ee/spec/services/geo/repository_updated_service_spec.rb' @@ -81,7 +78,6 @@ RSpec/ReturnFromStub: - 'ee/spec/services/merge_requests/build_service_spec.rb' - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb' - 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb' - - 'ee/spec/services/network_policies/resources_service_spec.rb' - 'ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb' - 'ee/spec/services/security/token_revocation_service_spec.rb' - 'ee/spec/services/system_notes/merge_train_service_spec.rb' @@ -99,7 +95,6 @@ RSpec/ReturnFromStub: - 'ee/spec/workers/ee/ci/build_finished_worker_spec.rb' - 'ee/spec/workers/geo/container_repository_sync_dispatch_worker_spec.rb' - 'ee/spec/workers/geo/design_repository_shard_sync_worker_spec.rb' - - 'ee/spec/workers/geo/file_download_dispatch_worker_spec.rb' - 'ee/spec/workers/geo/repository_shard_sync_worker_spec.rb' - 'ee/spec/workers/geo/repository_verification/primary/shard_worker_spec.rb' - 'ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb' diff --git a/.rubocop_todo/rspec/scattered_let.yml b/.rubocop_todo/rspec/scattered_let.yml index 52f19bf0768..e460884e36c 100644 --- a/.rubocop_todo/rspec/scattered_let.yml +++ b/.rubocop_todo/rspec/scattered_let.yml @@ -42,7 +42,6 @@ RSpec/ScatteredLet: - 'ee/spec/models/approval_wrapped_any_approver_rule_spec.rb' - 'ee/spec/models/approvals/scan_finding_wrapped_rule_set_spec.rb' - 'ee/spec/models/ci/minutes/notification_spec.rb' - - 'ee/spec/models/ci/minutes/quota_spec.rb' - 'ee/spec/models/ci/pipeline_spec.rb' - 'ee/spec/models/ee/ci/build_dependencies_spec.rb' - 'ee/spec/models/ee/namespace/root_storage_size_spec.rb' diff --git a/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue b/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue index 02aeb46a22b..6f351d91165 100644 --- a/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue +++ b/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue @@ -222,7 +222,7 @@ export default { /> + import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), }, inject: ['projectFullPath'], props: { @@ -45,6 +47,9 @@ export default { downstreamPipelines() { return this.linkedPipelines?.downstream?.nodes || []; }, + hasDownstreamPipelines() { + return this.downstreamPipelines.length > 0; + }, hasPipelineStages() { return this.pipelineStages.length > 0; }, @@ -82,11 +87,23 @@ export default { diff --git a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue index 137dfca68d6..4b9c98135ec 100644 --- a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue +++ b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue @@ -174,7 +174,7 @@ export default {
-import { GlIcon } from '@gitlab/ui'; -import PipelineStages from '~/pipelines/components/pipelines_list/pipeline_stages.vue'; +import PipelineStage from '~/pipelines/components/pipelines_list/pipeline_stage.vue'; /** * Renders the pipeline mini graph. */ export default { components: { - GlIcon, - PipelineStages, - LinkedPipelinesMiniList: () => - import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), + PipelineStage, }, - arrowStyles: [ - 'arrow-icon gl-display-inline-block gl-mx-1 gl-text-gray-500 gl-vertical-align-middle!', - ], props: { - downstreamPipelines: { - type: Array, - required: false, - default: () => [], - }, - isMergeTrain: { - type: Boolean, - required: false, - default: false, - }, - pipelinePath: { - type: String, - required: false, - default: '', - }, stages: { type: Array, required: true, - default: () => [], - }, - stagesClass: { - type: [Array, Object, String], - required: false, - default: '', }, updateDropdown: { type: Boolean, required: false, default: false, }, - upstreamPipeline: { - type: Object, + stagesClass: { + type: [Array, Object, String], required: false, - default: () => {}, + default: '', }, - }, - computed: { - hasDownstreamPipelines() { - return Boolean(this.downstreamPipelines.length); + isMergeTrain: { + type: Boolean, + required: false, + default: false, }, }, methods: { @@ -64,39 +36,19 @@ export default { }; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue index fa0e153b2af..7a08dacb824 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue @@ -80,7 +80,7 @@ export default { class="js-pipelines-retry-button" data-qa-selector="pipeline_retry_button" data-testid="pipelines-retry-button" - icon="repeat" + icon="retry" variant="default" category="secondary" @click="handleRetryClick" diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue deleted file mode 100644 index f1923e94a47..00000000000 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue +++ /dev/null @@ -1,54 +0,0 @@ - - diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue index 4046ee69428..53da98434b0 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue @@ -17,6 +17,8 @@ const DEFAULT_TH_CLASSES = export default { components: { GlTableLite, + LinkedPipelinesMiniList: () => + import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), PipelineMiniGraph, PipelineOperations, PipelinesStatusBadge, @@ -167,14 +169,29 @@ export default {