Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 13 deletions

diff --git a/app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql b/app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql
deleted file mode 100644
index 2aff7da4605..00000000000
--- a/app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-query($fullPath: ID!, $iid: String!) {
-  project(fullPath: $fullPath) {
-    issue(iid: $iid) {
-      iid
-    }
-  }
-}
diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js
index 8714bea1729..a61af631661 100644
--- a/app/assets/javascripts/sidebar/services/sidebar_service.js
+++ b/app/assets/javascripts/sidebar/services/sidebar_service.js
@@ -1,5 +1,4 @@
 import sidebarDetailsQuery from 'ee_else_ce/sidebar/queries/sidebarDetails.query.graphql';
-import sidebarDetailsForHealthStatusFeatureFlagQuery from 'ee_else_ce/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql';
 import axios from '~/lib/utils/axios_utils';
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 
@@ -27,14 +26,10 @@ export default class SidebarService {
   }
 
   get() {
-    const hasHealthStatusFeatureFlag = gon.features && gon.features.saveIssuableHealthStatus;
-
     return Promise.all([
       axios.get(this.endpoint),
       gqClient.query({
-        query: hasHealthStatusFeatureFlag
-          ? sidebarDetailsForHealthStatusFeatureFlagQuery
-          : sidebarDetailsQuery,
+        query: sidebarDetailsQuery,
         variables: {
           fullPath: this.fullPath,
           iid: this.iid.toString(),