diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/frequent_items | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/frequent_items')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/frequent_items/components/app.vue b/app/assets/javascripts/frequent_items/components/app.vue index dd405893e43..8ad9eeaa266 100644 --- a/app/assets/javascripts/frequent_items/components/app.vue +++ b/app/assets/javascripts/frequent_items/components/app.vue @@ -84,7 +84,7 @@ export default { logItemAccess(storageKey, unsanitizedItem) { const item = sanitizeItem(unsanitizedItem); - if (!AccessorUtilities.isLocalStorageAccessSafe()) { + if (!AccessorUtilities.canUseLocalStorage()) { return false; } diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue index 1137951ccfc..2f451e8353b 100644 --- a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue +++ b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable vue/require-default-prop, vue/no-v-html */ +/* eslint-disable vue/require-default-prop */ import { GlButton } from '@gitlab/ui'; import highlight from '~/lib/utils/highlight'; import { truncateNamespace } from '~/lib/utils/text_utility'; @@ -75,7 +75,7 @@ export default { ref="frequentItemsItemTitle" :title="itemName" class="frequent-items-item-title" - v-html="highlightedItemName" + v-html="highlightedItemName /* eslint-disable-line vue/no-v-html */" ></div> <div v-if="namespace" diff --git a/app/assets/javascripts/frequent_items/store/actions.js b/app/assets/javascripts/frequent_items/store/actions.js index 65a762f54ad..babc2ef2e32 100644 --- a/app/assets/javascripts/frequent_items/store/actions.js +++ b/app/assets/javascripts/frequent_items/store/actions.js @@ -25,7 +25,7 @@ export const receiveFrequentItemsError = ({ commit }) => { export const fetchFrequentItems = ({ state, dispatch }) => { dispatch('requestFrequentItems'); - if (AccessorUtilities.isLocalStorageAccessSafe()) { + if (AccessorUtilities.canUseLocalStorage()) { const storedFrequentItems = JSON.parse(localStorage.getItem(state.storageKey)); dispatch( |