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/error_tracking | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/error_tracking')
3 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index 2e27f51b71f..5db8c8cf8d3 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -118,7 +118,7 @@ export default { required: true, }, }, - hasLocalStorage: AccessorUtils.isLocalStorageAccessSafe(), + hasLocalStorage: AccessorUtils.canUseLocalStorage(), data() { return { errorSearchQuery: '', diff --git a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue index 68b4438831e..2b8a31da50f 100644 --- a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue +++ b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import { GlTooltip, GlSprintf, GlIcon } from '@gitlab/ui'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; @@ -132,7 +131,7 @@ export default { <td class="line_content" :class="{ old: isHighlighted(lineNum(line)) }" - v-html="lineCode(line)" + v-html="lineCode(line) /* eslint-disable-line vue/no-v-html */" ></td> </tr> </template> diff --git a/app/assets/javascripts/error_tracking/store/list/mutations.js b/app/assets/javascripts/error_tracking/store/list/mutations.js index d92a64947ad..523861363d7 100644 --- a/app/assets/javascripts/error_tracking/store/list/mutations.js +++ b/app/assets/javascripts/error_tracking/store/list/mutations.js @@ -22,7 +22,7 @@ export default { // only keep the last 5 state.recentSearches = recentSearches.slice(0, 5); - if (AccessorUtils.isLocalStorageAccessSafe()) { + if (AccessorUtils.canUseLocalStorage()) { localStorage.setItem( `recent-searches${state.indexPath}`, JSON.stringify(state.recentSearches), @@ -31,7 +31,7 @@ export default { }, [types.CLEAR_RECENT_SEARCHES](state) { state.recentSearches = []; - if (AccessorUtils.isLocalStorageAccessSafe()) { + if (AccessorUtils.canUseLocalStorage()) { localStorage.removeItem(`recent-searches${state.indexPath}`); } }, |