diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/pipelines/components/dag/dag.vue | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/pipelines/components/dag/dag.vue')
-rw-r--r-- | app/assets/javascripts/pipelines/components/dag/dag.vue | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue index 6267b63328c..85171263f08 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag.vue @@ -1,5 +1,5 @@ <script> -import { GlAlert, GlButton, GlEmptyState, GlSprintf } from '@gitlab/ui'; +import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { isEmpty } from 'lodash'; import { __ } from '~/locale'; import { fetchPolicies } from '~/lib/graphql'; @@ -17,11 +17,15 @@ export default { DagAnnotations, DagGraph, GlAlert, - GlSprintf, - GlEmptyState, GlButton, + GlEmptyState, + GlLink, + GlSprintf, }, inject: { + aboutDagDocPath: { + default: null, + }, dagDocPath: { default: null, }, @@ -89,14 +93,14 @@ export default { [DEFAULT]: __('An unknown error occurred while loading this graph.'), }, emptyStateTexts: { - title: __('Start using Directed Acyclic Graphs (DAG)'), + title: __('Speed up your pipelines with Needs relationships'), firstDescription: __( - "This pipeline does not use the %{codeStart}needs%{codeEnd} keyword and can't be represented as a directed acyclic graph.", + 'Using the %{codeStart}needs%{codeEnd} keyword makes jobs run before their stage is reached. Jobs run as soon as their %{codeStart}needs%{codeEnd} relationships are met, which speeds up your pipelines.', ), secondDescription: __( - 'Using %{codeStart}needs%{codeEnd} allows jobs to run before their stage is reached, as soon as their individual dependencies are met, which speeds up your pipelines.', + "If you add %{codeStart}needs%{codeEnd} to jobs in your pipeline you'll be able to view the %{codeStart}needs%{codeEnd} relationships between jobs in this tab as a %{linkStart}Directed Acyclic Graph (DAG)%{linkEnd}.", ), - button: __('Learn more about job dependencies'), + button: __('Learn more about Needs relationships'), }, computed: { failure() { @@ -222,6 +226,9 @@ export default { <template #code="{ content }"> <code>{{ content }}</code> </template> + <template #link="{ content }"> + <gl-link :href="aboutDagDocPath">{{ content }}</gl-link> + </template> </gl-sprintf> </p> </div> |