Add latest changes from gitlab-org/gitlab@master

4 files changed, 7 insertions, 42 deletions

diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index 99eb167172b..46d546c2ee4 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlSkeletonLoader, GlButton } from '@gitlab/ui';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { sprintf, __ } from '~/locale';
 import { joinPaths } from '~/lib/utils/url_utility';
 import getRefMixin from '../../mixins/get_ref';
@@ -17,7 +16,7 @@ export default {
     ParentRow,
     GlButton,
   },
-  mixins: [getRefMixin, glFeatureFlagMixin()],
+  mixins: [getRefMixin],
   apollo: {
     projectPath: {
       query: projectPathQuery,
@@ -93,9 +92,6 @@ export default {
     },
     generateRowNumber(path, id, index) {
       const key = `${path}-${id}-${index}`;
-      if (!this.glFeatures.lazyLoadCommits) {
-        return 0;
-      }
 
       if (!this.rowNumbers[key] && this.rowNumbers[key] !== 0) {
         this.$options.totalRowsLoaded += 1;
@@ -105,10 +101,6 @@ export default {
       return this.rowNumbers[key];
     },
     getCommit(fileName) {
-      if (!this.glFeatures.lazyLoadCommits) {
-        return {};
-      }
-
       return this.commits.find(
         (commitEntry) => commitEntry.filePath === joinPaths(this.path, fileName),
       );
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index e10ec07abc4..27ac11f3c58 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -19,7 +19,6 @@ import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import blobInfoQuery from 'shared_queries/repository/blob_info.query.graphql';
 import getRefMixin from '../../mixins/get_ref';
-import commitQuery from '../../queries/commit.query.graphql';
 
 export default {
   components: {
@@ -37,22 +36,6 @@ export default {
     GlHoverLoad: GlHoverLoadDirective,
     SafeHtml,
   },
-  apollo: {
-    commit: {
-      query: commitQuery,
-      variables() {
-        return {
-          fileName: this.name,
-          path: this.currentPath,
-          projectPath: this.projectPath,
-          maxOffset: this.totalEntries,
-        };
-      },
-      skip() {
-        return this.glFeatures.lazyLoadCommits;
-      },
-    },
-  },
   mixins: [getRefMixin, glFeatureFlagMixin()],
   props: {
     commitInfo: {
@@ -125,14 +108,13 @@ export default {
   },
   data() {
     return {
-      commit: null,
       hasRowAppeared: false,
       delayedRowAppear: null,
     };
   },
   computed: {
     commitData() {
-      return this.glFeatures.lazyLoadCommits ? this.commitInfo : this.commit;
+      return this.commitInfo;
     },
     routerLinkTo() {
       const blobRouteConfig = { path: `/-/blob/${this.escapedRef}/${escapeFileUrl(this.path)}` };
@@ -200,12 +182,10 @@ export default {
         return;
       }
 
-      if (this.glFeatures.lazyLoadCommits) {
-        this.delayedRowAppear = setTimeout(
-          () => this.$emit('row-appear', this.rowNumber),
-          ROW_APPEAR_DELAY,
-        );
-      }
+      this.delayedRowAppear = setTimeout(
+        () => this.$emit('row-appear', this.rowNumber),
+        ROW_APPEAR_DELAY,
+      );
     },
     rowDisappeared() {
       clearTimeout(this.delayedRowAppear);
diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index 8a45a351c35..4a8f83458f4 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -157,7 +157,7 @@ export default {
         .find(({ hasNextPage }) => hasNextPage);
     },
     handleRowAppear(rowNumber) {
-      if (!this.glFeatures.lazyLoadCommits || isRequested(rowNumber)) {
+      if (isRequested(rowNumber)) {
         return;
       }
 
diff --git a/app/assets/javascripts/repository/queries/commit.query.graphql b/app/assets/javascripts/repository/queries/commit.query.graphql
deleted file mode 100644
index 1a01462bd19..00000000000
--- a/app/assets/javascripts/repository/queries/commit.query.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-#import "ee_else_ce/repository/queries/commit.fragment.graphql"
-
-query getCommit($fileName: String!, $path: String!, $maxOffset: Number!) {
-  commit(path: $path, fileName: $fileName, maxOffset: $maxOffset) @client {
-    ...TreeEntryCommit
-  }
-}