Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 4 insertions, 15 deletions

diff --git a/app/assets/javascripts/terraform/components/states_table.vue b/app/assets/javascripts/terraform/components/states_table.vue
index d066834540f..efc2991f40f 100644
--- a/app/assets/javascripts/terraform/components/states_table.vue
+++ b/app/assets/javascripts/terraform/components/states_table.vue
@@ -1,14 +1,5 @@
 <script>
-import {
-  GlAlert,
-  GlBadge,
-  GlIcon,
-  GlLink,
-  GlLoadingIcon,
-  GlSprintf,
-  GlTable,
-  GlTooltip,
-} from '@gitlab/ui';
+import { GlAlert, GlBadge, GlLink, GlLoadingIcon, GlSprintf, GlTable, GlTooltip } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { s__ } from '~/locale';
 import CiBadge from '~/vue_shared/components/ci_badge_link.vue';
@@ -21,7 +12,6 @@ export default {
     CiBadge,
     GlAlert,
     GlBadge,
-    GlIcon,
     GlLink,
     GlLoadingIcon,
     GlSprintf,
@@ -128,7 +118,7 @@ export default {
   >
     <template #cell(name)="{ item }">
       <div
-        class="gl-display-flex align-items-center gl-justify-content-end gl-justify-content-md-start"
+        class="gl-display-flex align-items-center gl-justify-content-end gl-md-justify-content-start"
         data-testid="terraform-states-table-name"
       >
         <p class="gl-font-weight-bold gl-m-0 gl-text-gray-900">
@@ -156,8 +146,7 @@ export default {
           :id="`terraformLockedBadgeContainer${item.name}`"
           class="gl-mx-3"
         >
-          <gl-badge :id="`terraformLockedBadge${item.name}`">
-            <gl-icon name="lock" />
+          <gl-badge :id="`terraformLockedBadge${item.name}`" icon="lock">
             {{ $options.i18n.locked }}
           </gl-badge>
 
diff --git a/app/assets/javascripts/terraform/index.js b/app/assets/javascripts/terraform/index.js
index 1b8cab0d51e..34261f3c4db 100644
--- a/app/assets/javascripts/terraform/index.js
+++ b/app/assets/javascripts/terraform/index.js
@@ -1,5 +1,5 @@
+import { defaultDataIdFromObject } from '@apollo/client/core';
 import { GlToast } from '@gitlab/ui';
-import { defaultDataIdFromObject } from 'apollo-cache-inmemory';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';