diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 03:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 03:09:45 +0300 |
commit | d8f61f6383a930a4b25455fd8ccf624fa313bb07 (patch) | |
tree | d1a4eca43aa9a251ae37e9747f4461bebe9445fa /app/assets/javascripts/vue_merge_request_widget | |
parent | 179a30a49dbbbf4de03f28ac0fe9a8925d5f4883 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index 6250bedb2ec..206b6c7699e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -11,9 +11,9 @@ import { import SafeHtml from '~/vue_shared/directives/safe_html'; import { s__, n__ } from '~/locale'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/components/parsing_utils'; -import PipelineArtifacts from '~/ci/pipeline_details/components/pipelines_list/pipelines_artifacts.vue'; -import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/utils/parsing_utils'; +import PipelineArtifacts from '~/ci/pipeline_details/pipelines_list/components/pipelines_artifacts.vue'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue'; import { MT_MERGE_STRATEGY } from '../constants'; diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue index a4637c24726..1b03b9c04e1 100644 --- a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue +++ b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue @@ -3,7 +3,7 @@ import { uniqueId, uniq } from 'lodash'; import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status'; -import TestCaseDetails from '~/ci/pipeline_details/components/test_reports/test_case_details.vue'; +import TestCaseDetails from '~/ci/pipeline_details/test_reports/test_case_details.vue'; import MrWidget from '~/vue_merge_request_widget/components/widget/widget.vue'; import MrWidgetRow from '~/vue_merge_request_widget/components/widget/widget_content_row.vue'; import { DynamicScroller, DynamicScrollerItem } from 'vendor/vue-virtual-scroller'; |