Commit 755d1cbf authored by Fatih Acet's avatar Fatih Acet

Merge branch 'resolve_gitlab_issue_196658' into 'master'

Replace underscore with lodash for ./app/assets/javascripts/error_tracking

See merge request gitlab-org/gitlab!25143
parents f6b6dcf4 391e548d
...@@ -19,7 +19,7 @@ import AccessorUtils from '~/lib/utils/accessor'; ...@@ -19,7 +19,7 @@ import AccessorUtils from '~/lib/utils/accessor';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
import { __ } from '~/locale'; import { __ } from '~/locale';
import _ from 'underscore'; import { isEmpty } from 'lodash';
export const tableDataClass = 'table-col d-flex d-sm-table-cell align-items-center'; export const tableDataClass = 'table-col d-flex d-sm-table-cell align-items-center';
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
'cursor', 'cursor',
]), ]),
paginationRequired() { paginationRequired() {
return !_.isEmpty(this.pagination); return !isEmpty(this.pagination);
}, },
}, },
watch: { watch: {
......
<script> <script>
import _ from 'underscore'; import { escape as esc } from 'lodash';
import { GlTooltip } from '@gitlab/ui'; import { GlTooltip } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
? sprintf( ? sprintf(
__(`%{spanStart}in%{spanEnd} %{errorFn}`), __(`%{spanStart}in%{spanEnd} %{errorFn}`),
{ {
errorFn: `<strong>${_.escape(this.errorFn)}</strong>`, errorFn: `<strong>${esc(this.errorFn)}</strong>`,
spanStart: `<span class="text-tertiary">`, spanStart: `<span class="text-tertiary">`,
spanEnd: `</span>`, spanEnd: `</span>`,
}, },
......
---
title: Replace underscore with lodash for ./app/assets/javascripts/error_tracking
merge_request: 25143
author: Tobias Spagert
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment