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>2020-08-25 12:52:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-25 12:52:44 +0300
commit185d9acf520cc806840e8ba6c83deb1ec4817e0f (patch)
tree0557e72ec48f50bc81408157717f14907d10d2bd /app/assets/javascripts/jobs
parente65c1d31c934772eb571e221482d88fb7d21ceea (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/sidebar.vue8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index 54e6fc764fa..a6b6a4f1d5f 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -4,6 +4,7 @@ import { mapActions, mapState } from 'vuex';
import { GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import timeagoMixin from '~/vue_shared/mixins/timeago';
+import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
import DetailRow from './sidebar_detail_row.vue';
import ArtifactsBlock from './artifacts_block.vue';
@@ -24,6 +25,7 @@ export default {
JobsContainer,
GlLink,
GlDeprecatedButton,
+ TooltipOnTruncate,
},
mixins: [timeagoMixin],
props: {
@@ -111,7 +113,11 @@ export default {
<div class="sidebar-container">
<div class="blocks-container">
<div class="block d-flex flex-nowrap align-items-center">
- <h4 class="my-0 mr-2 text-break-word">{{ job.name }}</h4>
+ <tooltip-on-truncate :title="job.name" truncate-target="child"
+ ><h4 class="my-0 mr-2 gl-text-truncate">
+ {{ job.name }}
+ </h4>
+ </tooltip-on-truncate>
<div class="flex-grow-1 flex-shrink-0 text-right">
<gl-link
v-if="job.retry_path"