diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-02 07:34:53 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-02 07:34:53 +0000 |
| commit | 3fd4c77ee4777464af74acd0c9dda319e1d29a44 (patch) | |
| tree | f9e47d414e2fd56b04fb310d0488c381599fc2fa | |
| parent | 02ad0c2f6aedfe5053a79b027cc2882115c1cad5 (diff) | |
| parent | 7e670000032d35a416056d179382fd998d6622fc (diff) | |
| download | gitlab-ce-3fd4c77ee4777464af74acd0c9dda319e1d29a44.tar.gz | |
Merge branch '63984-rename-in-folder' into 'master'
Hid re-named entries in subfolders
Closes #63984
See merge request gitlab-org/gitlab-ce!30242
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/file_row.vue | 2 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/file_row_spec.js | 13 |
2 files changed, 14 insertions, 1 deletions
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({ |