Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 9 deletions

diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 1ea6eb2628b..578fcc819b0 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -1,14 +1,12 @@
 <script>
 import FileHeader from '~/vue_shared/components/file_row_header.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
-import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue';
 
 export default {
   name: 'FileRow',
   components: {
     FileHeader,
     FileIcon,
-    ChangedFileIcon,
   },
   props: {
     file: {
@@ -19,11 +17,6 @@ export default {
       type: Number,
       required: true,
     },
-    showChangedIcon: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     isTree() {
@@ -121,15 +114,14 @@ export default {
     <div class="file-row-name-container">
       <span ref="textOutput" :style="levelIndentation" class="file-row-name str-truncated">
         <file-icon
-          v-if="!showChangedIcon || file.type === 'tree'"
           class="file-row-icon"
+          :class="{ 'text-secondary': file.type === 'tree' }"
           :file-name="file.name"
           :loading="file.loading"
           :folder="isTree"
           :opened="file.opened"
           :size="16"
         />
-        <changed-file-icon v-else :file="file" :size="16" class="append-right-5" />
         {{ file.name }}
       </span>
       <slot></slot>