Merge branch 'design-management-upload-client-ce' into 'master'

CE backport of design-management-upload-client

See merge request gitlab-org/gitlab-ce!26766

1 files changed, 12 insertions, 7 deletions

diff --git a/app/assets/javascripts/lib/graphql.js b/app/assets/javascripts/lib/graphql.js
index 64e4e899f44..ae02559415c 100644
--- a/app/assets/javascripts/lib/graphql.js
+++ b/app/assets/javascripts/lib/graphql.js
@@ -1,11 +1,16 @@
-import ApolloClient from 'apollo-boost';
+import { ApolloClient } from 'apollo-client';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { createUploadLink } from 'apollo-upload-client';
 import csrf from '~/lib/utils/csrf';
 
-export default (clientState = {}) =>
+export default (resolvers = {}) =>
   new ApolloClient({
-    uri: `${gon.relative_url_root}/api/graphql`,
-    headers: {
-      [csrf.headerKey]: csrf.token,
-    },
-    clientState,
+    link: createUploadLink({
+      uri: `${gon.relative_url_root}/api/graphql`,
+      headers: {
+        [csrf.headerKey]: csrf.token,
+      },
+    }),
+    cache: new InMemoryCache(),
+    resolvers,
   });