From 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Sep 2021 13:18:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-3-stable-ee --- app/assets/javascripts/behaviors/shortcuts/keybindings.js | 2 +- app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts/behaviors/shortcuts') diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js index 005ef103ded..ebf2ab0381e 100644 --- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js +++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js @@ -19,7 +19,7 @@ export const LOCAL_STORAGE_KEY = 'gl-keyboard-shortcuts-customizations'; */ export const getCustomizations = memoize(() => { let parsedCustomizations = {}; - const localStorageIsSafe = AccessorUtilities.isLocalStorageAccessSafe(); + const localStorageIsSafe = AccessorUtilities.canUseLocalStorage(); if (localStorageIsSafe) { try { diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue index 8f1518a1c9c..cf7a71d4206 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue @@ -13,7 +13,7 @@ export default { }, data() { return { - localStorageUsable: AccessorUtilities.isLocalStorageAccessSafe(), + localStorageUsable: AccessorUtilities.canUseLocalStorage(), shortcutsEnabled: !shouldDisableShortcuts(), }; }, -- cgit v1.2.1