Add latest changes from gitlab-org/gitlab@master

4 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index c30d6f05c6a..92e33b013c3 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -5,6 +5,7 @@ import FileTable from './table/index.vue';
 import getRefMixin from '../mixins/get_ref';
 import getFiles from '../queries/getFiles.query.graphql';
 import getProjectPath from '../queries/getProjectPath.query.graphql';
+import getVueFileListLfsBadge from '../queries/getVueFileListLfsBadge.query.graphql';
 import FilePreview from './preview/index.vue';
 import { readmeFile } from '../utils/readme';
 
@@ -20,6 +21,9 @@ export default {
     projectPath: {
       query: getProjectPath,
     },
+    vueFileListLfsBadge: {
+      query: getVueFileListLfsBadge,
+    },
   },
   props: {
     path: {
@@ -43,6 +47,7 @@ export default {
         blobs: [],
       },
       isLoadingFiles: false,
+      vueFileListLfsBadge: false,
     };
   },
   computed: {
@@ -77,6 +82,7 @@ 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 ae6409a0ac9..2ef0c078f13 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -23,6 +23,7 @@ export default function setupVueRepositoryList() {
       projectPath,
       projectShortPath,
       ref,
+      vueFileListLfsBadge: gon?.features?.vueFileListLfsBadge,
       commits: [],
     },
   });
diff --git a/app/assets/javascripts/repository/queries/getFiles.query.graphql b/app/assets/javascripts/repository/queries/getFiles.query.graphql
index 2aaf5066b4a..01ad72ef752 100644
--- a/app/assets/javascripts/repository/queries/getFiles.query.graphql
+++ b/app/assets/javascripts/repository/queries/getFiles.query.graphql
@@ -14,6 +14,7 @@ query getFiles(
   $ref: String!
   $pageSize: Int!
   $nextPageCursor: String
+  $vueLfsEnabled: Boolean = false
 ) {
   project(fullPath: $projectPath) {
     repository {
@@ -46,7 +47,7 @@ query getFiles(
             node {
               ...TreeEntry
               webUrl
-              lfsOid
+              lfsOid @include(if: $vueLfsEnabled)
             }
           }
           pageInfo {
diff --git a/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql b/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql
new file mode 100644
index 00000000000..3c3d14881da
--- /dev/null
+++ b/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql
@@ -0,0 +1,3 @@
+query getProjectShortPath {
+  vueFileListLfsBadge @client
+}