diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-12 09:08:47 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-12 09:08:47 +0000 |
commit | 0bb6765100a3752cd4d4eee62b897c6391a31838 (patch) | |
tree | 896ebffbdbef4f286f97883a226bb6dbd9bd2d21 | |
parent | 2f385f7fcb7bea82a0e8886404316026b8a1b5cc (diff) | |
parent | 3951fa9bbb8c73c8b3737948011d9dc74652848e (diff) | |
download | gitlab-ce-0bb6765100a3752cd4d4eee62b897c6391a31838.tar.gz |
Merge branch '13330-gdk-error-on-non-unique-graphql-fragment-pageinfo' into 'master'
Resolve "GDK error on non-unique GraphQL fragment 'PageInfo'"
Closes #13330
See merge request gitlab-org/gitlab-ce!31532
-rw-r--r-- | app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql | 4 | ||||
-rw-r--r-- | app/assets/javascripts/repository/queries/getFiles.query.graphql | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql new file mode 100644 index 00000000000..7403fd6d3c2 --- /dev/null +++ b/app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql @@ -0,0 +1,4 @@ +fragment PageInfo on PageInfo { + hasNextPage + endCursor +} diff --git a/app/assets/javascripts/repository/queries/getFiles.query.graphql b/app/assets/javascripts/repository/queries/getFiles.query.graphql index b3cc0878cad..c4814f8e63a 100644 --- a/app/assets/javascripts/repository/queries/getFiles.query.graphql +++ b/app/assets/javascripts/repository/queries/getFiles.query.graphql @@ -1,3 +1,5 @@ +#import "~/graphql_shared/fragments/pageInfo.fragment.graphql" + fragment TreeEntry on Entry { id name @@ -5,11 +7,6 @@ fragment TreeEntry on Entry { type } -fragment PageInfo on PageInfo { - hasNextPage - endCursor -} - query getFiles( $projectPath: ID! $path: String |