Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

2 files changed, 5 insertions, 6 deletions

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index c2c035963f4..8dcab55ac61 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -218,14 +218,14 @@ export default class Clusters {
   }
 
   setBannerDismissedState(status, isDismissed) {
-    if (AccessorUtilities.isLocalStorageAccessSafe()) {
+    if (AccessorUtilities.canUseLocalStorage()) {
       window.localStorage.setItem(this.clusterBannerDismissedKey, `${status}_${isDismissed}`);
     }
   }
 
   isBannerDismissed(status) {
     let bannerState;
-    if (AccessorUtilities.isLocalStorageAccessSafe()) {
+    if (AccessorUtilities.canUseLocalStorage()) {
       bannerState = window.localStorage.getItem(this.clusterBannerDismissedKey);
     }
 
@@ -233,7 +233,7 @@ export default class Clusters {
   }
 
   setClusterNewlyCreated(state) {
-    if (AccessorUtilities.isLocalStorageAccessSafe()) {
+    if (AccessorUtilities.canUseLocalStorage()) {
       window.localStorage.setItem(this.clusterNewlyCreatedKey, Boolean(state));
     }
   }
@@ -242,7 +242,7 @@ export default class Clusters {
     // once this is true, it will always be true for a given page load
     if (!this.isNewlyCreated) {
       let newlyCreated;
-      if (AccessorUtilities.isLocalStorageAccessSafe()) {
+      if (AccessorUtilities.canUseLocalStorage()) {
         newlyCreated = window.localStorage.getItem(this.clusterNewlyCreatedKey);
       }
 
diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
index b9c55409330..0da7be4040f 100644
--- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
+++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
@@ -1,5 +1,4 @@
 <script>
-/* eslint-disable vue/no-v-html */
 import { GlModal, GlButton, GlFormInput } from '@gitlab/ui';
 import { escape } from 'lodash';
 import csrf from '~/lib/utils/csrf';
@@ -141,7 +140,7 @@ export default {
           <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
         </ul>
       </div>
-      <strong v-html="confirmationTextLabel"></strong>
+      <strong v-html="confirmationTextLabel /* eslint-disable-line vue/no-v-html */"></strong>
       <form ref="form" :action="clusterPath" method="post" class="gl-mb-5">
         <input ref="method" type="hidden" name="_method" value="delete" />
         <input :value="csrfToken" type="hidden" name="authenticity_token" />