Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 4d60cf5b1cc..e3a606571c0 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -39,6 +39,10 @@ export default {
         'is-open': this.file.opened,
       };
     },
+    textForTitle() {
+      // don't output a title if we don't have the expanded path
+      return this.file?.tree?.length ? this.file.tree[0].parentPath : false;
+    },
   },
   watch: {
     'file.active': function fileActiveWatch(active) {
@@ -106,7 +110,7 @@ export default {
   <div
     v-else
     :class="fileClass"
-    :title="file.name"
+    :title="textForTitle"
     class="file-row"
     role="button"
     @click="clickFile"
diff --git a/app/assets/javascripts/vue_shared/components/file_row_header.vue b/app/assets/javascripts/vue_shared/components/file_row_header.vue
index 301fd8116a9..2c3e2a3a433 100644
--- a/app/assets/javascripts/vue_shared/components/file_row_header.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row_header.vue
@@ -19,7 +19,7 @@ export default {
 </script>
 
 <template>
-  <div class="file-row-header bg-white sticky-top p-2 js-file-row-header">
+  <div class="file-row-header bg-white sticky-top p-2 js-file-row-header" :title="path">
     <span class="bold">{{ truncatedPath }}</span>
   </div>
 </template>