From 5d3df551dda6104f1ed8aa8f3947a2c982f0a7bc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 31 Aug 2023 21:11:00 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rules.gitlab-ci.yml | 1 + CHANGELOG.md | 62 +++++++ Gemfile | 4 +- Gemfile.checksum | 4 +- Gemfile.lock | 8 +- .../components/dag/constants.js | 0 .../pipeline_details}/components/dag/dag.vue | 0 .../components/dag/dag_annotations.vue | 0 .../components/dag/dag_graph.vue | 0 .../components/dag/drawing_utils.js | 0 .../components/dag/interactions.js | 0 .../components/graph/constants.js | 0 .../components/graph/graph_component.vue | 0 .../graph/graph_component_wrapper.vue | 0 .../components/graph/graph_view_selector.vue | 0 .../components/graph/job_group_dropdown.vue | 0 .../components/graph/job_item.vue | 0 .../components/graph/linked_pipeline.vue | 4 +- .../graph/linked_pipelines_column.vue | 0 .../components/graph/perf_utils.js | 0 .../graph/stage_column_component.vue | 0 .../components/graph/utils.js | 0 .../components/graph_shared/api.js | 0 .../components/graph_shared/drawing_utils.js | 0 .../graph_shared/linked_graph_wrapper.vue | 0 .../components/graph_shared/links_inner.vue | 0 .../components/graph_shared/links_layer.vue | 0 .../graph_shared/main_graph_wrapper.vue | 0 .../components/jobs/failed_jobs_app.vue | 0 .../components/jobs/failed_jobs_table.vue | 0 .../components/jobs/jobs_app.vue | 0 .../jobs_shared/action_component.vue | 0 .../jobs_shared/job_name_component.vue | 0 .../components/parsing_utils.js | 0 .../components/pipeline_details_header.vue | 0 .../components/pipeline_graph/job_pill.vue | 0 .../pipeline_graph/pipeline_graph.vue | 0 .../components/pipeline_graph/stage_name.vue | 0 .../accessors/linked_pipelines_accessors.js | 0 .../pipeline_mini_graph/job_item.vue | 0 .../pipeline_mini_graph/legacy_job_item.vue | 0 .../legacy_pipeline_mini_graph.vue | 0 .../legacy_pipeline_stage.vue | 0 .../linked_pipelines_mini_list.vue | 0 .../pipeline_mini_graph.vue | 10 +- .../pipeline_mini_graph/pipeline_stage.vue | 6 +- .../pipeline_mini_graph/pipeline_stages.vue | 0 .../components/pipeline_tabs.vue | 0 .../components/pipelines_list/empty_state.vue | 0 .../empty_state/ci_templates.vue | 0 .../empty_state/ios_templates.vue | 2 +- .../empty_state/pipelines_ci_templates.vue | 0 .../failure_widget/failed_job_details.vue | 2 +- .../failure_widget/failed_jobs_list.vue | 4 +- .../pipeline_failed_jobs_widget.vue | 0 .../pipelines_list/failure_widget/utils.js | 0 .../pipelines_list/nav_controls.vue | 0 .../pipelines_list/pipeline_labels.vue | 0 .../pipelines_list/pipeline_multi_actions.vue | 0 .../pipelines_list/pipeline_operations.vue | 0 .../pipelines_list/pipeline_stop_modal.vue | 0 .../pipelines_list/pipeline_triggerer.vue | 0 .../pipelines_list/pipeline_url.vue | 0 .../components/pipelines_list/pipelines.vue | 0 .../pipelines_list/pipelines_artifacts.vue | 0 .../pipelines_filtered_search.vue | 0 .../pipelines_manual_actions.vue | 0 .../pipelines_list/pipelines_status_badge.vue | 2 +- .../pipelines_list/pipelines_table.vue | 6 +- .../components/pipelines_list/time_ago.vue | 0 .../pipelines_list/tokens/constants.js | 0 .../tokens/pipeline_branch_name_token.vue | 0 .../tokens/pipeline_source_token.vue | 2 +- .../tokens/pipeline_status_token.vue | 0 .../tokens/pipeline_tag_name_token.vue | 0 .../tokens/pipeline_trigger_author_token.vue | 0 .../components/test_reports/empty_state.vue | 0 .../test_reports/test_case_details.vue | 0 .../components/test_reports/test_reports.vue | 0 .../test_reports/test_suite_table.vue | 0 .../components/test_reports/test_summary.vue | 0 .../test_reports/test_summary_table.vue | 0 .../components/unwrapping_utils.js | 0 .../pipeline_details}/constants.js | 0 .../pipeline_details}/event_hub.js | 0 ...ipeline_stages_connection.fragment.graphql | 0 .../cancel_pipeline.mutation.graphql | 0 .../delete_pipeline.mutation.graphql | 0 .../dismiss_pipeline_notification.graphql | 0 .../retry_failed_job.mutation.graphql | 0 .../retry_mr_failed_job.mutation.graphql | 0 .../mutations/retry_pipeline.mutation.graphql | 0 .../pipeline_details}/graphql/provider.js | 0 .../queries/get_dag_vis_data.query.graphql | 0 .../queries/get_failed_jobs.query.graphql | 0 .../get_linked_pipelines.query.graphql | 0 .../get_merge_request_pipelines.query.graphql | 0 .../get_pipeline_actions.query.graphql | 0 .../get_pipeline_failed_jobs.query.graphql | 0 ...t_pipeline_failed_jobs_count.query.graphql | 0 .../get_pipeline_header_data.query.graphql | 0 .../queries/get_pipeline_jobs.query.graphql | 0 .../queries/get_pipeline_stage.query.graphql | 0 .../queries/get_pipeline_stages.query.graphql | 0 .../mixins/pipelines_mixin.js | 2 +- .../mixins/stage_column_mixin.js | 0 .../pipeline_details_bundle.js | 4 +- .../pipeline_details_header.js | 0 .../pipeline_shared_client.js | 0 .../pipeline_details}/pipeline_tabs.js | 2 +- .../pipeline_details}/pipelines_index.js | 0 .../pipeline_details}/routes.js | 0 .../services/pipelines_service.js | 0 .../stores/pipelines_store.js | 0 .../stores/test_reports/actions.js | 0 .../stores/test_reports/constants.js | 0 .../stores/test_reports/getters.js | 0 .../stores/test_reports/index.js | 0 .../stores/test_reports/mutation_types.js | 0 .../stores/test_reports/mutations.js | 0 .../stores/test_reports/state.js | 0 .../stores/test_reports/utils.js | 0 .../pipeline_details}/utils.js | 0 .../header/pipeline_editor_mini_graph.vue | 6 +- .../components/header/pipeline_status.vue | 4 +- .../components/pipeline_editor_tabs.vue | 2 +- .../graphql/queries/ci_config.query.graphql | 2 +- .../pipeline_editor/pipeline_editor_app.vue | 2 +- .../commit/pipelines/pipelines_table.vue | 12 +- .../pipelines/pipelines_table_wrapper.vue | 6 +- .../environments_pagination_api_mixin.js | 2 +- .../pages/projects/pipelines/index/index.js | 2 +- .../pages/projects/pipelines/show/index.js | 2 +- .../commit_box_pipeline_mini_graph.vue | 12 +- .../components/commit_box_pipeline_status.vue | 2 +- .../queries/get_timelogs.query.graphql | 8 +- .../time_tracking/components/timelogs_app.vue | 28 +-- .../user_lists/components/user_list.vue | 2 +- .../components/mr_widget_pipeline.vue | 6 +- .../extensions/test_report/index.vue | 2 +- app/controllers/groups/labels_controller.rb | 9 +- app/controllers/projects/refs_controller.rb | 4 + .../resolvers/group_issues_resolver.rb | 5 + app/graphql/resolvers/issues_resolver.rb | 1 + app/models/bulk_imports/entity.rb | 19 +- app/policies/project_policy.rb | 1 + .../error_tracking/list_projects_service.rb | 8 +- .../audit_event_streaming/index.md | 7 +- doc/api/graphql/reference/index.md | 1 - .../application_security/dast/proxy-based.md | 3 + lib/api/entities/project_import_status.rb | 11 +- lib/api/ml/mlflow/api_helpers.rb | 8 + lib/api/ml/mlflow/entrypoint.rb | 3 +- lib/api/project_import.rb | 8 +- lib/api/projects.rb | 7 +- .../validations/validators/bulk_imports.rb | 8 +- lib/gitlab/pagination/gitaly_keyset_pager.rb | 6 +- lib/gitlab/regex/bulk_imports.rb | 22 --- locale/gitlab.pot | 19 +- qa/gdk/Dockerfile.gdk | 66 ++----- qa/qa/page/project/pipeline/index.rb | 10 +- qa/qa/page/project/pipeline/show.rb | 10 +- qa/qa/page/project/pipeline_editor/show.rb | 2 +- .../consumer/resources/graphql/pipelines.js | 4 +- .../specs/project/pipelines/show.spec.js | 4 +- .../groups/labels_controller_spec.rb | 66 +++++-- .../projects/refs_controller_spec.rb | 88 ++++++--- spec/factories/bulk_import/entities.rb | 1 + .../header/pipeline_editor_mini_graph_spec.js | 4 +- .../components/header/pipeline_status_spec.js | 2 +- .../components/pipeline_editor_tabs_spec.js | 2 +- spec/frontend/ci/pipeline_editor/mock_data.js | 2 +- .../commit_box_pipeline_mini_graph_spec.js | 8 +- .../commit/pipelines/pipelines_table_spec.js | 2 +- .../pipelines/pipelines_table_wrapper_spec.js | 2 +- spec/frontend/fixtures/pipeline_header.rb | 2 +- spec/frontend/fixtures/pipelines.rb | 2 +- .../components/dag/dag_annotations_spec.js | 2 +- .../components/dag/dag_graph_spec.js | 14 +- .../pipelines/components/dag/dag_spec.js | 14 +- .../components/dag/drawing_utils_spec.js | 4 +- .../components/jobs/failed_jobs_app_spec.js | 6 +- .../components/jobs/failed_jobs_table_spec.js | 6 +- .../components/jobs/jobs_app_spec.js | 4 +- .../pipeline_mini_graph/job_item_spec.js | 2 +- .../legacy_pipeline_mini_graph_spec.js | 4 +- .../legacy_pipeline_stage_spec.js | 4 +- .../linked_pipelines_mini_list_spec.js | 2 +- .../pipeline_mini_graph_spec.js | 8 +- .../pipeline_stage_spec.js | 4 +- .../pipeline_stages_spec.js | 4 +- .../components/pipeline_tabs_spec.js | 4 +- .../pipelines_filtered_search_spec.js | 4 +- .../empty_state/ci_templates_spec.js | 2 +- .../empty_state/ios_templates_spec.js | 4 +- .../pipelines_ci_templates_spec.js | 4 +- .../failure_widget/failed_job_details_spec.js | 6 +- .../failure_widget/failed_jobs_list_spec.js | 8 +- .../pipeline_failed_jobs_widget_spec.js | 4 +- .../failure_widget/utils_spec.js | 2 +- .../pipieline_stop_modal_spec.js | 2 +- spec/frontend/pipelines/empty_state_spec.js | 6 +- .../pipelines/graph/action_component_spec.js | 2 +- .../pipelines/graph/graph_component_spec.js | 14 +- .../graph/graph_component_wrapper_spec.js | 18 +- .../graph/graph_view_selector_spec.js | 4 +- .../graph/job_group_dropdown_spec.js | 2 +- .../frontend/pipelines/graph/job_item_spec.js | 4 +- .../graph/job_name_component_spec.js | 2 +- .../pipelines/graph/linked_pipeline_spec.js | 12 +- .../graph/linked_pipelines_column_spec.js | 12 +- spec/frontend/pipelines/graph/mock_data.js | 4 +- .../graph/stage_column_component_spec.js | 6 +- .../graph_shared/links_inner_spec.js | 6 +- .../graph_shared/links_layer_spec.js | 4 +- spec/frontend/pipelines/nav_controls_spec.js | 2 +- .../pipelines/pipeline_details_header_spec.js | 12 +- .../pipeline_graph/pipeline_graph_spec.js | 10 +- .../pipelines/pipeline_graph/utils_spec.js | 8 +- .../pipelines/pipeline_labels_spec.js | 2 +- .../pipelines/pipeline_multi_actions_spec.js | 4 +- .../pipelines/pipeline_operations_spec.js | 8 +- spec/frontend/pipelines/pipeline_tabs_spec.js | 6 +- .../pipelines/pipeline_triggerer_spec.js | 2 +- spec/frontend/pipelines/pipeline_url_spec.js | 4 +- .../pipelines/pipelines_artifacts_spec.js | 2 +- .../pipelines_manual_actions_spec.js | 6 +- spec/frontend/pipelines/pipelines_spec.js | 12 +- .../pipelines/pipelines_store_spec.js | 2 +- .../pipelines/pipelines_table_spec.js | 18 +- .../test_reports/empty_state_spec.js | 2 +- .../pipelines/test_reports/mock_data.js | 2 +- .../test_reports/stores/actions_spec.js | 4 +- .../test_reports/stores/getters_spec.js | 4 +- .../test_reports/stores/mutations_spec.js | 4 +- .../test_reports/stores/utils_spec.js | 2 +- .../test_reports/test_case_details_spec.js | 2 +- .../test_reports/test_reports_spec.js | 10 +- .../test_reports/test_suite_table_spec.js | 12 +- .../test_reports/test_summary_spec.js | 4 +- .../test_reports/test_summary_table_spec.js | 4 +- spec/frontend/pipelines/time_ago_spec.js | 2 +- .../tokens/pipeline_branch_name_token_spec.js | 2 +- .../tokens/pipeline_source_token_spec.js | 4 +- .../tokens/pipeline_status_token_spec.js | 2 +- .../tokens/pipeline_tag_name_token_spec.js | 2 +- .../pipeline_trigger_author_token_spec.js | 2 +- .../pipelines/unwrapping_utils_spec.js | 2 +- spec/frontend/pipelines/utils_spec.js | 6 +- .../components/timelogs_app_spec.js | 25 ++- .../user_lists/components/user_list_spec.js | 2 +- .../components/mr_widget_pipeline_spec.js | 2 +- .../extensions/test_report/index_spec.js | 2 +- .../design_management/delete_spec.rb | 2 +- spec/helpers/nav/new_dropdown_helper_spec.rb | 1 + spec/helpers/projects_helper_spec.rb | 1 + .../entities/project_import_status_spec.rb | 38 +++- .../destination_namespace_path_spec.rb | 43 +++++ .../source_full_path_validator_spec.rb | 168 ++++++++++++++++++ .../pipelines/lfs_objects_pipeline_spec.rb | 4 +- .../common/pipelines/uploads_pipeline_spec.rb | 6 +- .../pipelines/design_bundle_pipeline_spec.rb | 5 +- .../repository_bundle_pipeline_spec.rb | 5 +- .../pagination/gitaly_keyset_pager_spec.rb | 24 ++- spec/lib/gitlab/regex_spec.rb | 68 ------- ...count_bulk_imports_entities_metric_spec.rb | 10 +- ...unt_imported_projects_total_metric_spec.rb | 6 +- spec/models/bulk_imports/entity_spec.rb | 11 +- spec/policies/project_policy_spec.rb | 11 ++ spec/requests/api/bulk_imports_spec.rb | 14 ++ .../api/ml/mlflow/experiments_spec.rb | 4 +- spec/requests/api/ml/mlflow/runs_spec.rb | 12 +- spec/requests/api/projects_spec.rb | 41 ++++- .../list_projects_service_spec.rb | 16 +- ...redacted_search_results_shared_examples.rb | 2 +- .../api/ml/mlflow/mlflow_shared_examples.rb | 15 +- 276 files changed, 1007 insertions(+), 567 deletions(-) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/constants.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/dag.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/dag_annotations.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/dag_graph.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/drawing_utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/dag/interactions.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/constants.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/graph_component.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/graph_component_wrapper.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/graph_view_selector.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/job_group_dropdown.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/job_item.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/linked_pipeline.vue (97%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/linked_pipelines_column.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/perf_utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/stage_column_component.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph/utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/api.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/drawing_utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/linked_graph_wrapper.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/links_inner.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/links_layer.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/graph_shared/main_graph_wrapper.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/jobs/failed_jobs_app.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/jobs/failed_jobs_table.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/jobs/jobs_app.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/jobs_shared/action_component.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/jobs_shared/job_name_component.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/parsing_utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_details_header.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_graph/job_pill.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_graph/pipeline_graph.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_graph/stage_name.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/job_item.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/legacy_job_item.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/legacy_pipeline_stage.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/linked_pipelines_mini_list.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/pipeline_mini_graph.vue (89%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/pipeline_stage.vue (86%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_mini_graph/pipeline_stages.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipeline_tabs.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/empty_state.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/empty_state/ci_templates.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/empty_state/ios_templates.vue (99%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/empty_state/pipelines_ci_templates.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/failure_widget/failed_job_details.vue (98%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/failure_widget/failed_jobs_list.vue (96%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/failure_widget/utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/nav_controls.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_labels.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_multi_actions.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_operations.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_stop_modal.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_triggerer.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipeline_url.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines_artifacts.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines_filtered_search.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines_manual_actions.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines_status_badge.vue (92%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/pipelines_table.vue (95%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/time_ago.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/constants.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/pipeline_branch_name_token.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/pipeline_source_token.vue (90%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/pipeline_status_token.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/pipeline_tag_name_token.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/pipelines_list/tokens/pipeline_trigger_author_token.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/empty_state.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/test_case_details.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/test_reports.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/test_suite_table.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/test_summary.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/test_reports/test_summary_table.vue (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/components/unwrapping_utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/constants.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/event_hub.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/fragments/pipeline_stages_connection.fragment.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/cancel_pipeline.mutation.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/delete_pipeline.mutation.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/dismiss_pipeline_notification.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/retry_failed_job.mutation.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/retry_mr_failed_job.mutation.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/mutations/retry_pipeline.mutation.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/provider.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_dag_vis_data.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_failed_jobs.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_linked_pipelines.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_merge_request_pipelines.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_actions.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_failed_jobs.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_failed_jobs_count.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_header_data.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_jobs.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_stage.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/graphql/queries/get_pipeline_stages.query.graphql (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/mixins/pipelines_mixin.js (99%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/mixins/stage_column_mixin.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/pipeline_details_bundle.js (91%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/pipeline_details_header.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/pipeline_shared_client.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/pipeline_tabs.js (97%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/pipelines_index.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/routes.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/services/pipelines_service.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/pipelines_store.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/actions.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/constants.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/getters.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/index.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/mutation_types.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/mutations.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/state.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/stores/test_reports/utils.js (100%) rename app/assets/javascripts/{pipelines => ci/pipeline_details}/utils.js (100%) create mode 100644 spec/lib/api/validations/validators/bulk_imports/destination_namespace_path_spec.rb create mode 100644 spec/lib/api/validations/validators/bulk_imports/source_full_path_validator_spec.rb diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 09123914376..305a220ab53 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -613,6 +613,7 @@ - qa/gdk/**/* - Gemfile.lock - yarn.lock + - scripts/build_gdk_image - scripts/frontend/postinstall.js - workhorse/**/* - vendor/gems/**/* diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2f5dc4c44..1ca564561b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 16.3.1 (2023-08-31) + +### Fixed (1 change) + +- [Geo: Resync direct upload object stored artifacts](gitlab-org/security/gitlab@5db060ebf8829d027d61403fe9e30f5dc04e17ae) **GitLab Enterprise Edition** + +### Security (11 changes) + +- [Add authorization checks to import status endpoint](gitlab-org/security/gitlab@4ab4a1e5a3388f222154a3c4d71487303bc15387) ([merge request](gitlab-org/security/gitlab!3513)) +- [Update commonmarker to 0.23.10](gitlab-org/security/gitlab@58c3c6e164f7c4f20a711f996b9816d767cafc8c) ([merge request](gitlab-org/security/gitlab!3507)) +- [Remove DAST secret variables when URL is updated](gitlab-org/security/gitlab@038471d42bfe5a15df95645b487c9c6872528a33) ([merge request](gitlab-org/security/gitlab!3498)) +- [Maintainer can leak sentry token by changing the configured URL](gitlab-org/security/gitlab@62ac5e0cb77f61c107c4b91a442927ab666056e8) ([merge request](gitlab-org/security/gitlab!3516)) +- [Service account users are external by default](gitlab-org/security/gitlab@8c6892ba0144d202a346d9cc83488fa5d9ae044b) ([merge request](gitlab-org/security/gitlab!3501)) +- [Additional permission check when editing label](gitlab-org/security/gitlab@ec01380d19929259a95bf2d198cdffde3351806f) ([merge request](gitlab-org/security/gitlab!3504)) +- [Fix ReDOS in bulk_imports endpoint params](gitlab-org/security/gitlab@6e043d181b1c4968777efd0ab06bc9879a5a2076) ([merge request](gitlab-org/security/gitlab!3510)) +- [Prevent namespace level banned users from accessing API](gitlab-org/security/gitlab@ca3180b89ee5601b3a535058ae0a51def2b78a0f) ([merge request](gitlab-org/security/gitlab!3519)) +- [Check prohibit_outer_forks in fork relationship api](gitlab-org/security/gitlab@95f74317906732a0f8c6db830dcd9ac1113f69d3) ([merge request](gitlab-org/security/gitlab!3479)) +- [Prevent traversal for `path` parameter in refs/switch endpoint](gitlab-org/security/gitlab@12b3b42cf27750b6b7c2c4b62352b444b4b4ae34) ([merge request](gitlab-org/security/gitlab!3491)) +- [Gitaly keyset pager when pagination none only with tree view](gitlab-org/security/gitlab@39cbdd7aae475cee11bc720ef25e02518dd54b99) ([merge request](gitlab-org/security/gitlab!3495)) + ## 16.3.0 (2023-08-21) ### Added (169 changes) @@ -791,6 +811,28 @@ entry. - [Fix test pollution in count_deployments_metric_spec](gitlab-org/gitlab@610e6a033fe9b20aabc237b18837cddf150d4d1b) ([merge request](gitlab-org/gitlab!126808)) - [Update BulkImports::PipelineBatchWorker resource boundary](gitlab-org/gitlab@7d2477d81bcc2d035be26587802706f7098b6e44) ([merge request](gitlab-org/gitlab!126696)) +## 16.2.5 (2023-08-31) + +### Fixed (1 change) + +- [Geo: Resync direct upload object stored artifacts](gitlab-org/security/gitlab@2b89dcd8d4e238ee081b5a886a43f2d7d390e853) **GitLab Enterprise Edition** + +### Security (13 changes) + +- [Add authorization checks to import status endpoint](gitlab-org/security/gitlab@4ace6aaeaa836d0545576857080b6a01163d40b6) ([merge request](gitlab-org/security/gitlab!3514)) +- [Update commonmarker to 0.23.10](gitlab-org/security/gitlab@41ae8c446666e478addfff8c2d450103435c1ac1) ([merge request](gitlab-org/security/gitlab!3508)) +- [Remove DAST secret variables when URL is updated](gitlab-org/security/gitlab@ab9b3384bfdf15698285e99d1f31c7d8b3ec7db5) ([merge request](gitlab-org/security/gitlab!3499)) +- [Maintainer can leak sentry token by changing the configured URL](gitlab-org/security/gitlab@8c423fdd1afceedf34a5d7c11f9be96b7d273b95) ([merge request](gitlab-org/security/gitlab!3517)) +- [Service account users are external by default](gitlab-org/security/gitlab@9abbd558d4307c4bcb62a5fea2bffa2e59ded4fa) ([merge request](gitlab-org/security/gitlab!3502)) +- [Additional permission check when editing label](gitlab-org/security/gitlab@416b3a3d448c21b96c4cd6dda42da2e561f8040d) ([merge request](gitlab-org/security/gitlab!3505)) +- [Fix ReDOS in bulk_imports endpoint params](gitlab-org/security/gitlab@90dbac471eff8d1d867db979be5aaf7f8660e64c) ([merge request](gitlab-org/security/gitlab!3511)) +- [Prevent namespace level banned users from accessing API](gitlab-org/security/gitlab@76ce2605f091d7c2d10ed3dd00cf8c7e37e26b5a) ([merge request](gitlab-org/security/gitlab!3484)) +- [Requires write_model_experiments on mlflow api](gitlab-org/security/gitlab@a385fb7b6422e6d41c8197655947fc6d3f0d65c8) ([merge request](gitlab-org/security/gitlab!3480)) +- [Check prohibit_outer_forks in fork relationship api](gitlab-org/security/gitlab@d8ee7ec151440088bb34b5d2c20b490986bba654) ([merge request](gitlab-org/security/gitlab!3477)) +- [Remove GCP private key from streaming audit events UI](gitlab-org/security/gitlab@36b15be1d8643172d4f54063fb6430068d57e6f8) ([merge request](gitlab-org/security/gitlab!3487)) +- [Prevent traversal for `path` parameter in refs/switch endpoint](gitlab-org/security/gitlab@89cd4dae070fcf20df467639934accb41f5c46da) ([merge request](gitlab-org/security/gitlab!3475)) +- [Gitaly keyset pager when pagination none only with tree view](gitlab-org/security/gitlab@498f72aed3d0e70f7af5335ee3fb11f6cfc21986) ([merge request](gitlab-org/security/gitlab!3481)) + ## 16.2.4 (2023-08-11) ### Fixed (2 changes) @@ -1556,6 +1598,26 @@ No changes. - [Add schema_version in the commits index mapping](gitlab-org/gitlab@e75b94903b69e1e1588e251217926882875555a8) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123435)) **GitLab Enterprise Edition** - [Allow to set labels for Redis calls](gitlab-org/gitlab@8ccfff9e2d250eb22afaa7d0243e707b536a5436) ([merge request](gitlab-org/gitlab!122340)) +## 16.1.5 (2023-08-31) + +### Fixed (1 change) + +- [Geo: Resync direct upload object stored artifacts](gitlab-org/security/gitlab@2bb514a62edce03477b16049ad20030609779a05) **GitLab Enterprise Edition** + +### Security (11 changes) + +- [Add authorization checks to import status endpoint](gitlab-org/security/gitlab@c2dad0797d673348e75f695bea6459a5849beb99) ([merge request](gitlab-org/security/gitlab!3515)) +- [Update commonmarker to 0.23.10](gitlab-org/security/gitlab@13c49cfed688bd255716e44a33600fcda5f847a9) ([merge request](gitlab-org/security/gitlab!3509)) +- [Remove DAST secret variables when URL is updated](gitlab-org/security/gitlab@8c5c9eda9a4f3da398cc2617a562ab080d259337) ([merge request](gitlab-org/security/gitlab!3500)) +- [Maintainer can leak sentry token by changing the configured URL](gitlab-org/security/gitlab@9d961725e5732190fd9797c8807adbce3778fa71) ([merge request](gitlab-org/security/gitlab!3518)) +- [Service account users are external by default](gitlab-org/security/gitlab@64d11f5e38ef7f6916887bd916c3571901a6d4a5) ([merge request](gitlab-org/security/gitlab!3503)) +- [Additional permission check when editing label](gitlab-org/security/gitlab@f2cb7ebae05f63dfa00e434a9e4d86ebf972a5e2) ([merge request](gitlab-org/security/gitlab!3506)) +- [Fix ReDOS in bulk_imports endpoint params](gitlab-org/security/gitlab@c5815c2b1863bc197266f1efeca88568205214d6) ([merge request](gitlab-org/security/gitlab!3512)) +- [Prevent namespace level banned users from accessing API](gitlab-org/security/gitlab@c99f5af50d231c47673a5873610b27a0418c8320) ([merge request](gitlab-org/security/gitlab!3485)) +- [Check prohibit_outer_forks in fork relationship api](gitlab-org/security/gitlab@8d2c0249ec06d245df7449d2b0e0349e1fe20329) ([merge request](gitlab-org/security/gitlab!3478)) +- [Prevent traversal for `path` parameter in refs/switch endpoint](gitlab-org/security/gitlab@ce664649a8827dbd91ce5491308a040dc332dd58) ([merge request](gitlab-org/security/gitlab!3476)) +- [Gitaly keyset pager when pagination none only with tree view](gitlab-org/security/gitlab@884a061d1f04fb19bee884dac9b8cafc3c1cdb1c) ([merge request](gitlab-org/security/gitlab!3482)) + ## 16.1.4 (2023-08-03) No changes. diff --git a/Gemfile b/Gemfile index a0c8aa7854b..ada9063d1bc 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 3.2.0' +gem 'view_component', '~> 3.5.0' # Supported DBs gem 'pg', '~> 1.5.3' @@ -199,7 +199,7 @@ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive gem 'html-pipeline', '~> 2.14.3' gem 'deckar01-task_list', '2.3.2' gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.9' +gem 'commonmarker', '~> 0.23.10' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' diff --git a/Gemfile.checksum b/Gemfile.checksum index 4286d1bc47c..05ccecb621f 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -84,7 +84,7 @@ {"name":"coderay","version":"1.1.3","platform":"ruby","checksum":"dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b"}, {"name":"coercible","version":"1.0.0","platform":"ruby","checksum":"5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc"}, {"name":"colored2","version":"3.1.2","platform":"ruby","checksum":"b13c2bd7eeae2cf7356a62501d398e72fde78780bd26aec6a979578293c28b4a"}, -{"name":"commonmarker","version":"0.23.9","platform":"ruby","checksum":"2e739c85a6961531cb6f5ba5169f2c7f64471b7e700c64b048ec22a5b230811c"}, +{"name":"commonmarker","version":"0.23.10","platform":"ruby","checksum":"fdd312ae2bb4071b2f3085d4d7533cb9f8d9057a2eaa0760228a65bc3ed565d1"}, {"name":"concurrent-ruby","version":"1.2.2","platform":"ruby","checksum":"3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f"}, {"name":"connection_pool","version":"2.3.0","platform":"ruby","checksum":"677985be912f33c90f98f229aaa0c0ddb2ef8776f21929a36eeeb25251c944da"}, {"name":"cork","version":"0.3.0","platform":"ruby","checksum":"a0a0ac50e262f8514d1abe0a14e95e71c98b24e3378690e5d044daf0013ad4bc"}, @@ -674,7 +674,7 @@ {"name":"validates_hostname","version":"1.0.11","platform":"ruby","checksum":"d506bae0342ec14c920eb319e057fc1886c321a59b85b4b6e966ee4b88fab8c3"}, {"name":"version_gem","version":"1.1.0","platform":"ruby","checksum":"6b009518020db57f51ec7b410213fae2bf692baea9f1b51770db97fbc93d9a80"}, {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"}, -{"name":"view_component","version":"3.2.0","platform":"ruby","checksum":"1dfaa85e13b5393f30b60bd3a03348b5298240a13137985d71eb2b8cc94c4c22"}, +{"name":"view_component","version":"3.5.0","platform":"ruby","checksum":"c3e3cdf5abb2383157684d76cfb153d23bfc9834a7defa82441edab54635e8af"}, {"name":"virtus","version":"2.0.0","platform":"ruby","checksum":"8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2"}, {"name":"vite_rails","version":"3.0.15","platform":"ruby","checksum":"b8ec528aedf7e24b54f222b449cd9250810ea2456d5f8dd4ef87f06b475cf860"}, {"name":"vite_ruby","version":"3.3.4","platform":"ruby","checksum":"025e438385a6dc2320c8c148dff453f5bb1d4f056ce69c3386f47d4c388ad80c"}, diff --git a/Gemfile.lock b/Gemfile.lock index 860df258e7e..afcf424b85d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -369,7 +369,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.23.9) + commonmarker (0.23.10) concurrent-ruby (1.2.2) connection_pool (2.3.0) cork (0.3.0) @@ -1665,7 +1665,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.2.0) + view_component (3.5.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1767,7 +1767,7 @@ DEPENDENCIES circuitbox (= 2.0.0) click_house-client! cloud_profiler_agent (~> 0.0.0)! - commonmarker (~> 0.23.9) + commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 4.0.0) @@ -2036,7 +2036,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.3) - view_component (~> 3.2.0) + view_component (~> 3.5.0) vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) diff --git a/app/assets/javascripts/pipelines/components/dag/constants.js b/app/assets/javascripts/ci/pipeline_details/components/dag/constants.js similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/constants.js rename to app/assets/javascripts/ci/pipeline_details/components/dag/constants.js diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/ci/pipeline_details/components/dag/dag.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/dag.vue rename to app/assets/javascripts/ci/pipeline_details/components/dag/dag.vue diff --git a/app/assets/javascripts/pipelines/components/dag/dag_annotations.vue b/app/assets/javascripts/ci/pipeline_details/components/dag/dag_annotations.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/dag_annotations.vue rename to app/assets/javascripts/ci/pipeline_details/components/dag/dag_annotations.vue diff --git a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue b/app/assets/javascripts/ci/pipeline_details/components/dag/dag_graph.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/dag_graph.vue rename to app/assets/javascripts/ci/pipeline_details/components/dag/dag_graph.vue diff --git a/app/assets/javascripts/pipelines/components/dag/drawing_utils.js b/app/assets/javascripts/ci/pipeline_details/components/dag/drawing_utils.js similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/drawing_utils.js rename to app/assets/javascripts/ci/pipeline_details/components/dag/drawing_utils.js diff --git a/app/assets/javascripts/pipelines/components/dag/interactions.js b/app/assets/javascripts/ci/pipeline_details/components/dag/interactions.js similarity index 100% rename from app/assets/javascripts/pipelines/components/dag/interactions.js rename to app/assets/javascripts/ci/pipeline_details/components/dag/interactions.js diff --git a/app/assets/javascripts/pipelines/components/graph/constants.js b/app/assets/javascripts/ci/pipeline_details/components/graph/constants.js similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/constants.js rename to app/assets/javascripts/ci/pipeline_details/components/graph/constants.js diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/graph_component.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/graph_component.vue diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component_wrapper.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/graph_component_wrapper.vue diff --git a/app/assets/javascripts/pipelines/components/graph/graph_view_selector.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/graph_view_selector.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/graph_view_selector.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/graph_view_selector.vue diff --git a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/job_group_dropdown.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/job_group_dropdown.vue diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/job_item.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/job_item.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/job_item.vue diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue similarity index 97% rename from app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue index d8b843bdfb0..8aa49e03718 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue @@ -11,8 +11,8 @@ import { TYPENAME_CI_PIPELINE } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { __, sprintf } from '~/locale'; -import CancelPipelineMutation from '~/pipelines/graphql/mutations/cancel_pipeline.mutation.graphql'; -import RetryPipelineMutation from '~/pipelines/graphql/mutations/retry_pipeline.mutation.graphql'; +import CancelPipelineMutation from '~/ci/pipeline_details/graphql/mutations/cancel_pipeline.mutation.graphql'; +import RetryPipelineMutation from '~/ci/pipeline_details/graphql/mutations/retry_pipeline.mutation.graphql'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import { reportToSentry } from '../../utils'; import { ACTION_FAILURE, DOWNSTREAM, UPSTREAM } from './constants'; diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipelines_column.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipelines_column.vue diff --git a/app/assets/javascripts/pipelines/components/graph/perf_utils.js b/app/assets/javascripts/ci/pipeline_details/components/graph/perf_utils.js similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/perf_utils.js rename to app/assets/javascripts/ci/pipeline_details/components/graph/perf_utils.js diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/ci/pipeline_details/components/graph/stage_column_component.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/stage_column_component.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph/stage_column_component.vue diff --git a/app/assets/javascripts/pipelines/components/graph/utils.js b/app/assets/javascripts/ci/pipeline_details/components/graph/utils.js similarity index 100% rename from app/assets/javascripts/pipelines/components/graph/utils.js rename to app/assets/javascripts/ci/pipeline_details/components/graph/utils.js diff --git a/app/assets/javascripts/pipelines/components/graph_shared/api.js b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/api.js similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/api.js rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/api.js diff --git a/app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/drawing_utils.js similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/drawing_utils.js diff --git a/app/assets/javascripts/pipelines/components/graph_shared/linked_graph_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/linked_graph_wrapper.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/linked_graph_wrapper.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/linked_graph_wrapper.vue diff --git a/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_inner.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_inner.vue diff --git a/app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_layer.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_layer.vue diff --git a/app/assets/javascripts/pipelines/components/graph_shared/main_graph_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/components/graph_shared/main_graph_wrapper.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/graph_shared/main_graph_wrapper.vue rename to app/assets/javascripts/ci/pipeline_details/components/graph_shared/main_graph_wrapper.vue diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue b/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_app.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue rename to app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_app.vue diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue b/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_table.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue rename to app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_table.vue diff --git a/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue b/app/assets/javascripts/ci/pipeline_details/components/jobs/jobs_app.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/jobs/jobs_app.vue rename to app/assets/javascripts/ci/pipeline_details/components/jobs/jobs_app.vue diff --git a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue b/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/action_component.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue rename to app/assets/javascripts/ci/pipeline_details/components/jobs_shared/action_component.vue diff --git a/app/assets/javascripts/pipelines/components/jobs_shared/job_name_component.vue b/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/job_name_component.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/jobs_shared/job_name_component.vue rename to app/assets/javascripts/ci/pipeline_details/components/jobs_shared/job_name_component.vue diff --git a/app/assets/javascripts/pipelines/components/parsing_utils.js b/app/assets/javascripts/ci/pipeline_details/components/parsing_utils.js similarity index 100% rename from app/assets/javascripts/pipelines/components/parsing_utils.js rename to app/assets/javascripts/ci/pipeline_details/components/parsing_utils.js diff --git a/app/assets/javascripts/pipelines/components/pipeline_details_header.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_details_header.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_details_header.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_details_header.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/job_pill.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/job_pill.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_graph/job_pill.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/job_pill.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/stage_name.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/stage_name.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_job_item.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_job_item.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_job_item.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_job_item.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue similarity index 100% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue similarity index 89% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue index 7cdaec81466..a4e6fec1625 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue +++ b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue @@ -2,14 +2,14 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { createAlert } from '~/alert'; import { __ } from '~/locale'; -import { keepLatestDownstreamPipelines } from '~/pipelines/components/parsing_utils'; +import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/components/parsing_utils'; import { getQueryHeaders, toggleQueryPollingByVisibility, -} from '~/pipelines/components/graph/utils'; -import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/pipelines/constants'; -import getLinkedPipelinesQuery from '~/pipelines/graphql/queries/get_linked_pipelines.query.graphql'; -import getPipelineStagesQuery from '~/pipelines/graphql/queries/get_pipeline_stages.query.graphql'; +} from '~/ci/pipeline_details/components/graph/utils'; +import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/ci/pipeline_details/constants'; +import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; +import getPipelineStagesQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql'; import LegacyPipelineMiniGraph from './legacy_pipeline_mini_graph.vue'; export default { diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue similarity index 86% rename from app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue rename to app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue index 8e22f440089..44e2849cdac 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue +++ b/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue @@ -1,12 +1,12 @@