Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 5 deletions

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
-}