From 7e670000032d35a416056d179382fd998d6622fc Mon Sep 17 00:00:00 2001
From: Denys Mishunov <dmishunov@gitlab.com>
Date: Tue, 2 Jul 2019 00:29:57 +0200
Subject: [PATCH] Hid re-named entries in subfolders

---
 .../javascripts/vue_shared/components/file_row.vue  |  2 +-
 .../vue_shared/components/file_row_spec.js          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 1bfa91500cb..fe5289ff371 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -131,7 +131,7 @@ export default {
 </script>
 
 <template>
-  <div>
+  <div v-if="!file.moved">
     <file-header v-if="file.isHeader" :path="file.path" />
     <div
       v-else
diff --git a/spec/javascripts/vue_shared/components/file_row_spec.js b/spec/javascripts/vue_shared/components/file_row_spec.js
index 7da69e3fa84..6abcac5c0ff 100644
--- a/spec/javascripts/vue_shared/components/file_row_spec.js
+++ b/spec/javascripts/vue_shared/components/file_row_spec.js
@@ -90,6 +90,19 @@ describe('File row component', () => {
     expect(vm.$el.querySelector('.js-file-row-header')).not.toBe(null);
   });
 
+  it('is not rendered for `moved` entries in subfolders', () => {
+    createComponent({
+      file: {
+        path: 't5',
+        moved: true,
+        tree: [],
+      },
+      level: 2,
+    });
+
+    expect(vm.$el.nodeType).not.toEqual(1);
+  });
+
   describe('new dropdown', () => {
     beforeEach(() => {
       createComponent({