Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-29 18:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-29 18:09:53 +0300
commit65e97ca5a0072ed41aaebaf756b164748a93720b (patch)
tree9f6241b0659eee7ec17bca687f80c05fb0130124 /app/assets/javascripts/ci
parent149878ca3c94f2f3be4161d590626909c53435d5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci')
-rw-r--r--app/assets/javascripts/ci/jobs_page/components/jobs_table_empty_state.vue1
-rw-r--r--app/assets/javascripts/ci/pipeline_details/dag/dag.vue1
-rw-r--r--app/assets/javascripts/ci/pipelines_page/components/empty_state/no_ci_empty_state.vue1
-rw-r--r--app/assets/javascripts/ci/pipelines_page/pipelines.vue1
4 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/ci/jobs_page/components/jobs_table_empty_state.vue b/app/assets/javascripts/ci/jobs_page/components/jobs_table_empty_state.vue
index d2cd27be034..7effb8fe239 100644
--- a/app/assets/javascripts/ci/jobs_page/components/jobs_table_empty_state.vue
+++ b/app/assets/javascripts/ci/jobs_page/components/jobs_table_empty_state.vue
@@ -29,6 +29,7 @@ export default {
:title="$options.i18n.title"
:description="$options.i18n.description"
:svg-path="emptyStateSvgPath"
+ :svg-height="null"
:primary-button-link="pipelineEditorPath"
:primary-button-text="$options.i18n.buttonText"
data-testid="jobs-empty-state"
diff --git a/app/assets/javascripts/ci/pipeline_details/dag/dag.vue b/app/assets/javascripts/ci/pipeline_details/dag/dag.vue
index 5415340c956..fb8e5d679b7 100644
--- a/app/assets/javascripts/ci/pipeline_details/dag/dag.vue
+++ b/app/assets/javascripts/ci/pipeline_details/dag/dag.vue
@@ -220,6 +220,7 @@ export default {
<gl-empty-state
v-else-if="hasNoDependentJobs"
:svg-path="emptyDagSvgPath"
+ :svg-height="null"
:title="$options.emptyStateTexts.title"
>
<template #description>
diff --git a/app/assets/javascripts/ci/pipelines_page/components/empty_state/no_ci_empty_state.vue b/app/assets/javascripts/ci/pipelines_page/components/empty_state/no_ci_empty_state.vue
index 6e7d6908cd9..728e8541ae3 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/empty_state/no_ci_empty_state.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/empty_state/no_ci_empty_state.vue
@@ -47,6 +47,7 @@ export default {
v-else
title=""
:svg-path="emptyStateSvgPath"
+ :svg-height="null"
:description="$options.i18n.noCiDescription"
/>
</div>
diff --git a/app/assets/javascripts/ci/pipelines_page/pipelines.vue b/app/assets/javascripts/ci/pipelines_page/pipelines.vue
index f4105040f31..94632684c3a 100644
--- a/app/assets/javascripts/ci/pipelines_page/pipelines.vue
+++ b/app/assets/javascripts/ci/pipelines_page/pipelines.vue
@@ -419,6 +419,7 @@ export default {
<gl-empty-state
v-else-if="stateToRender === $options.stateMap.error"
:svg-path="errorStateSvgPath"
+ :svg-height="null"
:title="s__('Pipelines|There was an error fetching the pipelines.')"
:description="s__('Pipelines|Try again in a few moments or contact your support team.')"
/>