diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 18:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 18:09:01 +0300 |
commit | d88ab3545c27cd674f5fb8bff5fb64a9eeed590f (patch) | |
tree | c0c6cc7065a765a6c93d67cebbe0dd16431296bd /app/assets/javascripts/vue_shared | |
parent | f0a387b4a5f08d6739894455664b4d3cb1509cc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue index 8008b85bbdb..6453290f6ea 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue @@ -55,7 +55,7 @@ export default { return createdSecondsAgo < SECONDS_IN_DAY; }, author() { - return this.issuable.author; + return this.issuable.author || {}; }, webUrl() { return this.issuable.gitlabWebUrl || this.issuable.webUrl; @@ -215,7 +215,7 @@ export default { <span class="gl-display-none gl-sm-display-inline"> <span aria-hidden="true">·</span> <span class="issuable-authored gl-mr-3"> - <gl-sprintf :message="__('created %{timeAgo} by %{author}')"> + <gl-sprintf v-if="author.name" :message="__('created %{timeAgo} by %{author}')"> <template #timeAgo> <span v-gl-tooltip.bottom @@ -241,6 +241,17 @@ export default { </gl-link> </template> </gl-sprintf> + <gl-sprintf v-else :message="__('created %{timeAgo}')"> + <template #timeAgo> + <span + v-gl-tooltip.bottom + :title="tooltipTitle(issuable.createdAt)" + data-testid="issuable-created-at" + > + {{ createdAt }} + </span> + </template> + </gl-sprintf> </span> <slot name="timeframe"></slot> </span> |