diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-15 00:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-15 00:09:21 +0300 |
commit | 066e210e0749525d632d36f40b32e69ff055b17b (patch) | |
tree | f4c3ea48875b1d67b8f263e65274f0a31fbad09b /app/assets/javascripts/pipelines | |
parent | f55c9253556dd5dab700d76fa88aa04891343100 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/job_item.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/components/header_component.vue | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index 795b95421c7..f69b25dfa7c 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -234,8 +234,9 @@ export default { :title="tooltipText" :class="jobClasses" :href="detailsPath" - class="js-pipeline-graph-job-link qa-job-link menu-item gl-text-gray-900 gl-active-text-decoration-none gl-focus-text-decoration-none gl-hover-text-decoration-none gl-w-full" + class="js-pipeline-graph-job-link menu-item gl-text-gray-900 gl-active-text-decoration-none gl-focus-text-decoration-none gl-hover-text-decoration-none gl-w-full" :data-testid="testId" + data-qa-selector="job_link" @click="jobItemClick" @mouseout="hideTooltips" > diff --git a/app/assets/javascripts/pipelines/components/header_component.vue b/app/assets/javascripts/pipelines/components/header_component.vue index ac97c9d2743..04b78b8aa23 100644 --- a/app/assets/javascripts/pipelines/components/header_component.vue +++ b/app/assets/javascripts/pipelines/components/header_component.vue @@ -249,8 +249,7 @@ export default { :title="$options.BUTTON_TOOLTIP_RETRY" :loading="isRetrying" :disabled="isRetrying" - category="secondary" - variant="info" + variant="confirm" data-testid="retryPipeline" class="js-retry-button" @click="retryPipeline()" @@ -262,7 +261,6 @@ export default { v-if="canCancelPipeline" :loading="isCanceling" :disabled="isCanceling" - class="gl-ml-3" variant="danger" data-testid="cancelPipeline" @click="cancelPipeline()" |