summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorDan Davison <ddavison@gitlab.com>2019-02-01 18:39:38 +0000
committerDan Davison <ddavison@gitlab.com>2019-02-01 18:39:38 +0000
commit3a042391ae89b967ce104acf3dbe8191c572ef25 (patch)
tree48d3b5411f78eff91959f0397d8003b66af35b8a /app/assets/javascripts
parentcd4e202517f56cd90baed3605a66b8ae899fc464 (diff)
parent86a313bb41178db2e3cc205d2f9f193d6e929911 (diff)
downloadgitlab-ce-3a042391ae89b967ce104acf3dbe8191c572ef25.tar.gz
Merge branch 'auto-devops-better-build-debugging' into 'master'
Wait for auto-devops CI jobs on the job page See merge request gitlab-org/gitlab-ce!24839
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/jobs/components/stages_dropdown.vue4
-rw-r--r--app/assets/javascripts/pipelines/components/graph/job_item.vue2
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue
index 91332c21b52..c5076d65ff9 100644
--- a/app/assets/javascripts/jobs/components/stages_dropdown.vue
+++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -39,7 +39,9 @@ export default {
<ci-icon :status="pipeline.details.status" class="vertical-align-middle" />
<span class="font-weight-bold">{{ __('Pipeline') }}</span>
- <a :href="pipeline.path" class="js-pipeline-path link-commit">#{{ pipeline.id }}</a>
+ <a :href="pipeline.path" class="js-pipeline-path link-commit qa-pipeline-path"
+ >#{{ pipeline.id }}</a
+ >
<template v-if="hasRef">
{{ __('from') }}
<a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a>
diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue
index cf9db89e32b..2b32a6e4a98 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_item.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue
@@ -108,7 +108,7 @@ export default {
:href="status.details_path"
:title="tooltipText"
:class="cssClassJobName"
- class="js-pipeline-graph-job-link"
+ class="js-pipeline-graph-job-link qa-job-link"
>
<job-name-component :name="job.name" :status="job.status" />
</gl-link>