Add latest changes from gitlab-org/gitlab@master

4 files changed, 1 insertions, 12 deletions

diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index 858b776ce2f..721cc6787dc 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -5,7 +5,6 @@ import FileTable from './table/index.vue';
 import getRefMixin from '../mixins/get_ref';
 import filesQuery from '../queries/files.query.graphql';
 import projectPathQuery from '../queries/project_path.query.graphql';
-import vueFileListLfsBadgeQuery from '../queries/vue_file_list_lfs_badge.query.graphql';
 import FilePreview from './preview/index.vue';
 import { readmeFile } from '../utils/readme';
 
@@ -21,9 +20,6 @@ export default {
     projectPath: {
       query: projectPathQuery,
     },
-    vueFileListLfsBadge: {
-      query: vueFileListLfsBadgeQuery,
-    },
   },
   props: {
     path: {
@@ -47,7 +43,6 @@ export default {
         blobs: [],
       },
       isLoadingFiles: false,
-      vueFileListLfsBadge: false,
     };
   },
   computed: {
@@ -82,7 +77,6 @@ export default {
             path: this.path || '/',
             nextPageCursor: this.nextPageCursor,
             pageSize: PAGE_SIZE,
-            vueLfsEnabled: this.vueFileListLfsBadge,
           },
         })
         .then(({ data }) => {
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 6528e283372..01db4e363ba 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -24,7 +24,6 @@ export default function setupVueRepositoryList() {
       projectShortPath,
       ref,
       escapedRef,
-      vueFileListLfsBadge: gon.features?.vueFileListLfsBadge || false,
       commits: [],
     },
   });
diff --git a/app/assets/javascripts/repository/queries/files.query.graphql b/app/assets/javascripts/repository/queries/files.query.graphql
index 2815bce9239..10843b0450f 100644
--- a/app/assets/javascripts/repository/queries/files.query.graphql
+++ b/app/assets/javascripts/repository/queries/files.query.graphql
@@ -14,7 +14,6 @@ query Files(
   $ref: String!
   $pageSize: Int!
   $nextPageCursor: String
-  $vueLfsEnabled: Boolean = false
 ) {
   project(fullPath: $projectPath) {
     repository {
@@ -47,7 +46,7 @@ query Files(
             node {
               ...TreeEntry
               webPath
-              lfsOid @include(if: $vueLfsEnabled)
+              lfsOid
             }
           }
           pageInfo {
diff --git a/app/assets/javascripts/repository/queries/vue_file_list_lfs_badge.query.graphql b/app/assets/javascripts/repository/queries/vue_file_list_lfs_badge.query.graphql
deleted file mode 100644
index 603e3d3bd81..00000000000
--- a/app/assets/javascripts/repository/queries/vue_file_list_lfs_badge.query.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query VueFileListLfsBadge {
-  vueFileListLfsBadge @client
-}