From 59223e71ada4330f2219e99e660cc8b6d470fc16 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Jun 2022 21:10:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../header/pipeline_editor_mini_graph.vue | 29 +- .../components/header/pipeline_status.vue | 2 +- .../pipelines_list/pipeline_mini_graph.vue | 88 +++- .../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 - doc/administration/instance_limits.md | 14 +- doc/api/usage_data.md | 2 +- doc/development/reusing_abstractions.md | 4 + doc/development/service_ping/implement.md | 2 +- doc/development/service_ping/index.md | 2 +- .../service_ping/metrics_dictionary.md | 2 +- .../service_ping/metrics_instrumentation.md | 2 +- .../service_ping/metrics_lifecycle.md | 2 +- .../performance_indicator_metrics.md | 2 +- .../service_ping/review_guidelines.md | 2 +- .../service_ping/troubleshooting.md | 2 +- doc/development/service_ping/usage_data.md | 2 +- .../snowplow/event_dictionary_guide.md | 2 +- doc/development/snowplow/implementation.md | 2 +- doc/development/snowplow/index.md | 2 +- doc/development/snowplow/infrastructure.md | 2 +- doc/development/snowplow/review_guidelines.md | 2 +- doc/development/snowplow/schemas.md | 2 +- doc/development/snowplow/troubleshooting.md | 2 +- doc/operations/product_analytics.md | 2 +- doc/security/rate_limits.md | 1 + .../incident_management_rate_limits.md | 38 ++ .../admin_area/settings/usage_statistics.md | 2 +- doc/user/gitlab_com/index.md | 1 + .../commit/mini_pipeline_graph_spec.rb | 2 +- .../settings/repository_settings_spec.rb | 4 +- .../commit_box_pipeline_mini_graph_spec.js | 16 +- .../header/pipeline_editor_mini_graph_spec.js | 109 +++++ ..._graph_spec.js => pipeline_stages_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 +- spec/support/finder_collection.rb | 48 +++ spec/support/finder_collection_allowlist.yml | 66 +++ 44 files changed, 1030 insertions(+), 191 deletions(-) create mode 100644 app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue create mode 100644 doc/user/admin_area/settings/incident_management_rate_limits.md create mode 100644 spec/frontend/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js rename spec/frontend/pipelines/components/pipelines_list/{pipeline_mini_graph_spec.js => pipeline_stages_spec.js} (92%) create mode 100644 spec/frontend/pipelines/linked_pipelines_mock_data.js create mode 100644 spec/frontend/pipelines/pipeline_mini_graph_spec.js create mode 100644 spec/support/finder_collection.rb create mode 100644 spec/support/finder_collection_allowlist.yml diff --git a/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue b/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue index 7beabcfe403..3662100d526 100644 --- a/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue +++ b/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue @@ -10,8 +10,6 @@ export default { }, components: { PipelineMiniGraph, - LinkedPipelinesMiniList: () => - import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), }, inject: ['projectFullPath'], props: { @@ -47,9 +45,6 @@ export default { downstreamPipelines() { return this.linkedPipelines?.downstream?.nodes || []; }, - hasDownstreamPipelines() { - return this.downstreamPipelines.length > 0; - }, hasPipelineStages() { return this.pipelineStages.length > 0; }, @@ -87,23 +82,11 @@ 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 4b9c98135ec..137dfca68d6 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 PipelineStage from '~/pipelines/components/pipelines_list/pipeline_stage.vue'; +import { GlIcon } from '@gitlab/ui'; +import PipelineStages from '~/pipelines/components/pipelines_list/pipeline_stages.vue'; /** * Renders the pipeline mini graph. */ export default { components: { - PipelineStage, + GlIcon, + PipelineStages, + LinkedPipelinesMiniList: () => + import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), }, + arrowStyles: [ + 'arrow-icon gl-display-inline-block gl-mx-1 gl-text-gray-500 gl-vertical-align-middle!', + ], props: { - stages: { + downstreamPipelines: { type: Array, - required: true, + required: false, + default: () => [], }, - updateDropdown: { + 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: '', }, - isMergeTrain: { + updateDropdown: { type: Boolean, required: false, default: false, }, + upstreamPipeline: { + type: Object, + required: false, + default: () => {}, + }, + }, + computed: { + hasDownstreamPipelines() { + return Boolean(this.downstreamPipelines.length); + }, }, methods: { onPipelineActionRequestComplete() { @@ -36,19 +64,39 @@ export default { }; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue new file mode 100644 index 00000000000..f1923e94a47 --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stages.vue @@ -0,0 +1,54 @@ + + 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 53da98434b0..4046ee69428 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue @@ -17,8 +17,6 @@ const DEFAULT_TH_CLASSES = export default { components: { GlTableLite, - LinkedPipelinesMiniList: () => - import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'), PipelineMiniGraph, PipelineOperations, PipelinesStatusBadge, @@ -169,29 +167,14 @@ export default {