Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 41 deletions

diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue
index 0071ed77779..66443a36b5c 100644
--- a/app/assets/javascripts/incidents/components/incidents_list.vue
+++ b/app/assets/javascripts/incidents/components/incidents_list.vue
@@ -72,18 +72,11 @@ export default {
     GlPagination,
     GlTabs,
     GlTab,
-    PublishedCell: () => import('ee_component/incidents/components/published_cell.vue'),
   },
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  inject: [
-    'projectPath',
-    'newIssuePath',
-    'incidentTemplateName',
-    'issuePath',
-    'publishedAvailable',
-  ],
+  inject: ['projectPath', 'newIssuePath', 'incidentTemplateName', 'issuePath'],
   apollo: {
     incidents: {
       query: getIncidents,
@@ -151,20 +144,6 @@ export default {
     newIncidentPath() {
       return mergeUrlParams({ issuable_template: this.incidentTemplateName }, this.newIssuePath);
     },
-    availableFields() {
-      return this.publishedAvailable
-        ? [
-            ...this.$options.fields,
-            ...[
-              {
-                key: 'published',
-                label: s__('IncidentManagement|Published'),
-                thClass: 'gl-pointer-events-none',
-              },
-            ],
-          ]
-        : this.$options.fields;
-    },
   },
   methods: {
     onInputChange: debounce(function debounceSearch(input) {
@@ -251,7 +230,7 @@ export default {
     </h4>
     <gl-table
       :items="incidents.list || []"
-      :fields="availableFields"
+      :fields="$options.fields"
       :show-empty="true"
       :busy="loading"
       stacked="md"
@@ -266,7 +245,7 @@ export default {
           <gl-icon
             v-if="item.state === 'closed'"
             name="issue-close"
-            class="gl-ml-1 gl-fill-blue-500"
+            class="gl-fill-blue-500"
             data-testid="incident-closed"
           />
         </div>
@@ -306,13 +285,6 @@ export default {
         </div>
       </template>
 
-      <template v-if="publishedAvailable" #cell(published)="{ item }">
-        <published-cell
-          :status-page-published-incident="item.statusPagePublishedIncident"
-          :un-published="$options.i18n.unPublished"
-        />
-      </template>
-
       <template #table-busy>
         <gl-loading-icon size="lg" color="dark" class="mt-3" />
       </template>
diff --git a/app/assets/javascripts/incidents/constants.js b/app/assets/javascripts/incidents/constants.js
index 0fc5c911cfe..3a3efa98f25 100644
--- a/app/assets/javascripts/incidents/constants.js
+++ b/app/assets/javascripts/incidents/constants.js
@@ -6,7 +6,6 @@ export const I18N = {
   unassigned: s__('IncidentManagement|Unassigned'),
   createIncidentBtnLabel: s__('IncidentManagement|Create incident'),
   searchPlaceholder: __('Search or filter results...'),
-  unPublished: s__('IncidentManagement|Unpublished'),
 };
 
 export const INCIDENT_STATE_TABS = [
diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
index c0942b629e5..d717d898ef0 100644
--- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
+++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
@@ -37,7 +37,6 @@ query getIncidents(
             webUrl
           }
         }
-        statusPagePublishedIncident
       }
       pageInfo {
         hasNextPage
diff --git a/app/assets/javascripts/incidents/list.js b/app/assets/javascripts/incidents/list.js
index 3809742e32b..6e39e631815 100644
--- a/app/assets/javascripts/incidents/list.js
+++ b/app/assets/javascripts/incidents/list.js
@@ -8,13 +8,7 @@ export default () => {
   const selector = '#js-incidents';
 
   const domEl = document.querySelector(selector);
-  const {
-    projectPath,
-    newIssuePath,
-    incidentTemplateName,
-    issuePath,
-    publishedAvailable,
-  } = domEl.dataset;
+  const { projectPath, newIssuePath, incidentTemplateName, issuePath } = domEl.dataset;
 
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(),
@@ -27,7 +21,6 @@ export default () => {
       incidentTemplateName,
       newIssuePath,
       issuePath,
-      publishedAvailable,
     },
     apolloProvider,
     components: {