Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 11 deletions

diff --git a/app/assets/javascripts/repository/queries/commit.query.graphql b/app/assets/javascripts/repository/queries/commit.query.graphql
index 387d8416105..7ae4a3b984a 100644
--- a/app/assets/javascripts/repository/queries/commit.query.graphql
+++ b/app/assets/javascripts/repository/queries/commit.query.graphql
@@ -1,6 +1,6 @@
 #import "ee_else_ce/repository/queries/commit.fragment.graphql"
 
-query getCommit($fileName: String!, $type: String!, $path: String!, $maxOffset: Int!) {
+query getCommit($fileName: String!, $type: String!, $path: String!, $maxOffset: Number!) {
   commit(path: $path, fileName: $fileName, type: $type, maxOffset: $maxOffset) @client {
     ...TreeEntryCommit
   }
diff --git a/app/assets/javascripts/repository/queries/typedefs.graphql b/app/assets/javascripts/repository/queries/typedefs.graphql
deleted file mode 100644
index 3b1c1c3fdcd..00000000000
--- a/app/assets/javascripts/repository/queries/typedefs.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-type LogTreeCommit {
-  sha: String
-  message: String
-  titleHtml: String
-  committedDate: Time
-  commitPath: String
-  fileName: String
-  filePath: String
-  type: String
-}