Automatic merge of gitlab-org/gitlab-ce master

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

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({