Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 52 deletions

diff --git a/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql b/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql
deleted file mode 100644
index 90d1a7794ea..00000000000
--- a/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query sidebarDetails($fullPath: ID!, $iid: String!) {
-  project(fullPath: $fullPath) {
-    id
-    issue(iid: $iid) {
-      id
-      iid
-    }
-  }
-}
diff --git a/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql b/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql
deleted file mode 100644
index 0505f88773d..00000000000
--- a/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query mergeRequestSidebarDetails($fullPath: ID!, $iid: String!) {
-  project(fullPath: $fullPath) {
-    id
-    mergeRequest(iid: $iid) {
-      id
-      iid # currently unused.
-    }
-  }
-}
diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js
index beacdeb559c..00d3177b75a 100644
--- a/app/assets/javascripts/sidebar/services/sidebar_service.js
+++ b/app/assets/javascripts/sidebar/services/sidebar_service.js
@@ -1,15 +1,8 @@
-import sidebarDetailsIssueQuery from 'ee_else_ce/sidebar/queries/sidebar_details.query.graphql';
 import { TYPE_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import axios from '~/lib/utils/axios_utils';
 import reviewerRereviewMutation from '../queries/reviewer_rereview.mutation.graphql';
-import sidebarDetailsMRQuery from '../queries/sidebar_details_mr.query.graphql';
-
-const queries = {
-  merge_request: sidebarDetailsMRQuery,
-  issue: sidebarDetailsIssueQuery,
-};
 
 export const gqClient = createGqClient(
   {},
@@ -36,37 +29,13 @@ export default class SidebarService {
   }
 
   get() {
-    return Promise.all([
-      axios.get(this.endpoint),
-      gqClient.query({
-        query: this.sidebarDetailsQuery(),
-        variables: {
-          fullPath: this.fullPath,
-          iid: this.iid.toString(),
-        },
-      }),
-    ]);
-  }
-
-  sidebarDetailsQuery() {
-    return queries[this.issuableType];
+    return axios.get(this.endpoint);
   }
 
   update(key, data) {
     return axios.put(this.endpoint, { [key]: data });
   }
 
-  updateWithGraphQl(mutation, variables) {
-    return gqClient.mutate({
-      mutation,
-      variables: {
-        ...variables,
-        projectPath: this.fullPath,
-        iid: this.iid.toString(),
-      },
-    });
-  }
-
   getProjectsAutocomplete(searchTerm) {
     return axios.get(this.projectsAutocompleteEndpoint, {
       params: {
diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js
index 238960046a5..912f0fdcbef 100644
--- a/app/assets/javascripts/sidebar/sidebar_mediator.js
+++ b/app/assets/javascripts/sidebar/sidebar_mediator.js
@@ -93,8 +93,8 @@ export default class SidebarMediator {
   fetch() {
     return this.service
       .get()
-      .then(([restResponse, graphQlResponse]) => {
-        this.processFetchedData(restResponse.data, graphQlResponse.data);
+      .then(({ data }) => {
+        this.processFetchedData(data);
       })
       .catch(() =>
         createAlert({