diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 09:09:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 09:09:35 +0300 |
commit | abbedc2027e64b11b03be4639411f1943b81f7ce (patch) | |
tree | 008a88ac70d5712e9c91855fa8304bf98628c0ea /app/assets/javascripts/vue_shared/components/commit.vue | |
parent | 2135111f19c8dce60f4956e460ad2d6e81f83e4b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/commit.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/commit.vue | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index d1eee62683b..5f50a699034 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -136,6 +136,9 @@ export default { refUrl() { return this.commitRef.ref_url || this.commitRef.path; }, + tooltipTitle() { + return this.mergeRequestRef ? this.mergeRequestRef.title : this.commitRef.name; + }, }, }; </script> @@ -148,23 +151,14 @@ export default { <gl-icon v-else name="branch" /> </div> - <gl-link - v-if="mergeRequestRef" - v-gl-tooltip - :href="mergeRequestRef.path" - :title="mergeRequestRef.title" - class="ref-name" - >{{ mergeRequestRef.iid }}</gl-link - > - <gl-link - v-else - v-gl-tooltip - :href="refUrl" - :title="commitRef.name" - class="ref-name" - data-testid="ref-name" - >{{ commitRef.name }}</gl-link - > + <tooltip-on-truncate :title="tooltipTitle" truncate-target="child" placement="top"> + <gl-link v-if="mergeRequestRef" :href="mergeRequestRef.path" class="ref-name"> + {{ mergeRequestRef.iid }} + </gl-link> + <gl-link v-else :href="refUrl" class="ref-name" data-testid="ref-name"> + {{ commitRef.name }} + </gl-link> + </tooltip-on-truncate> </template> <gl-icon name="commit" class="commit-icon js-commit-icon" /> |