diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 18:12:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 18:12:28 +0300 |
commit | 98014c0c43c1b1114d17c5851cd6313a9011d3ab (patch) | |
tree | 405bb6fb3e3e1bbdad0be2e4de43e353db8aeebd /app/assets/javascripts/pipelines | |
parent | 3f274363e9dc9a1be75edfcd3dd5adb64b1e8c29 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-ee
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue index 52da4d01468..7c78abae77f 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue @@ -136,8 +136,8 @@ export default { return __('Branch'); } }, - commitTitleText() { - return this.pipeline?.commit?.title || __("Can't find HEAD commit for this branch"); + commitTitle() { + return this.pipeline?.commit?.title; }, hasAuthor() { return ( @@ -159,22 +159,27 @@ export default { <div class="pipeline-tags" data-testid="pipeline-url-table-cell"> <template v-if="rearrangePipelinesTable"> <div class="commit-title gl-mb-2" data-testid="commit-title-container"> - <span class="gl-display-flex"> - <tooltip-on-truncate :title="commitTitleText" class="flex-truncate-child gl-flex-grow-1"> + <span v-if="commitTitle" class="gl-display-flex"> + <tooltip-on-truncate :title="commitTitle" class="flex-truncate-child gl-flex-grow-1"> <gl-link - :href="pipeline.path" - class="commit-row-message gl-text-blue-600!" + :href="commitUrl" + class="commit-row-message gl-text-gray-900" data-testid="commit-title" - data-qa-selector="pipeline_url_link" - >{{ commitTitleText }}</gl-link + >{{ commitTitle }}</gl-link > </tooltip-on-truncate> </span> + <span v-else>{{ __("Can't find HEAD commit for this branch") }}</span> </div> <div class="gl-mb-2"> - <span class="gl-font-weight-bold gl-text-gray-500" data-testid="pipeline-identifier"> + <gl-link + :href="pipeline.path" + class="gl-text-decoration-underline gl-text-blue-600!" + data-testid="pipeline-url-link" + data-qa-selector="pipeline_url_link" + > #{{ pipeline[pipelineKey] }} - </span> + </gl-link> <!--Commit row--> <div class="icon-container gl-display-inline-block"> <gl-icon |