Add latest changes from gitlab-org/gitlab@master

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">&middot;</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>