Add latest changes from gitlab-org/gitlab@master

7 files changed, 7 insertions, 15 deletions

diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index 41f7a4b147f..1f6b5e98122 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -103,14 +103,12 @@ export default {
 
       return this.rowNumbers[key];
     },
-    getCommit(fileName, type) {
+    getCommit(fileName) {
       if (!this.glFeatures.lazyLoadCommits) {
         return {};
       }
 
-      return this.commits.find(
-        (commitEntry) => commitEntry.fileName === fileName && commitEntry.type === type,
-      );
+      return this.commits.find((commitEntry) => commitEntry.fileName === fileName);
     },
   },
 };
@@ -152,7 +150,7 @@ export default {
               :loading-path="loadingPath"
               :total-entries="totalEntries"
               :row-number="generateRowNumber(entry.flatPath, entry.id, index)"
-              :commit-info="getCommit(entry.name, entry.type)"
+              :commit-info="getCommit(entry.name)"
               v-on="$listeners"
             />
           </template>
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index 2b910109f7d..4a823738ea1 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -43,7 +43,6 @@ export default {
       variables() {
         return {
           fileName: this.name,
-          type: this.type,
           path: this.currentPath,
           projectPath: this.projectPath,
           maxOffset: this.totalEntries,
diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js
index 29aabe1b00f..3a59a02af01 100644
--- a/app/assets/javascripts/repository/graphql.js
+++ b/app/assets/javascripts/repository/graphql.js
@@ -9,7 +9,7 @@ Vue.use(VueApollo);
 const defaultClient = createDefaultClient(
   {
     Query: {
-      commit(_, { path, fileName, type, maxOffset }) {
+      commit(_, { path, fileName, maxOffset }) {
         return new Promise((resolve) => {
           fetchLogsTree(
             defaultClient,
@@ -19,7 +19,6 @@ const defaultClient = createDefaultClient(
               resolve,
               entry: {
                 name: fileName,
-                type,
               },
             },
             maxOffset,
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index ac02392d60f..9345a8406e3 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -16,9 +16,7 @@ function setNextOffset(offset) {
 }
 
 export function resolveCommit(commits, path, { resolve, entry }) {
-  const commit = commits.find(
-    (c) => c.filePath === `${path}/${entry.name}` && c.type === entry.type,
-  );
+  const commit = commits.find((c) => c.filePath === `${path}/${entry.name}`);
 
   if (commit) {
     resolve(commit);
diff --git a/app/assets/javascripts/repository/queries/commit.fragment.graphql b/app/assets/javascripts/repository/queries/commit.fragment.graphql
index b046fc1f730..80dedfe3e3f 100644
--- a/app/assets/javascripts/repository/queries/commit.fragment.graphql
+++ b/app/assets/javascripts/repository/queries/commit.fragment.graphql
@@ -6,5 +6,4 @@ fragment TreeEntryCommit on LogTreeCommit {
   commitPath
   fileName
   filePath
-  type
 }
diff --git a/app/assets/javascripts/repository/queries/commit.query.graphql b/app/assets/javascripts/repository/queries/commit.query.graphql
index 7ae4a3b984a..1a01462bd19 100644
--- a/app/assets/javascripts/repository/queries/commit.query.graphql
+++ b/app/assets/javascripts/repository/queries/commit.query.graphql
@@ -1,7 +1,7 @@
 #import "ee_else_ce/repository/queries/commit.fragment.graphql"
 
-query getCommit($fileName: String!, $type: String!, $path: String!, $maxOffset: Number!) {
-  commit(path: $path, fileName: $fileName, type: $type, maxOffset: $maxOffset) @client {
+query getCommit($fileName: String!, $path: String!, $maxOffset: Number!) {
+  commit(path: $path, fileName: $fileName, maxOffset: $maxOffset) @client {
     ...TreeEntryCommit
   }
 }
diff --git a/app/assets/javascripts/repository/utils/commit.js b/app/assets/javascripts/repository/utils/commit.js
index a67252ec004..878b4fdd71a 100644
--- a/app/assets/javascripts/repository/utils/commit.js
+++ b/app/assets/javascripts/repository/utils/commit.js
@@ -7,7 +7,6 @@ export function normalizeData(data, path, extra = () => {}) {
     commitPath: d.commit_path,
     fileName: d.file_name,
     filePath: `${path}/${d.file_name}`,
-    type: d.type,
     __typename: 'LogTreeCommit',
     ...extra(d),
   }));