Commit e9ef4e58 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '210271-replace-underscore-with-lodash-for-ee-app-assets-javascripts-sidebar' into 'master'

Replace underscore with lodash for ./ee/..sidebar

Closes #210271

See merge request gitlab-org/gitlab!28149
parents 48ab2d81 08ab9284
<script>
import { GlLoadingIcon, GlLink, GlTooltip } from '@gitlab/ui';
import { escape } from 'underscore';
import { escape as esc } from 'lodash';
import { __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
......@@ -39,7 +39,7 @@ export default {
// Fallback to None if immediate parent is unavailable.
let { title } = immediateParent;
title = escape(title);
title = esc(title);
const { humanReadableEndDate, humanReadableTimestamp } = immediateParent;
......
import Vue from 'vue';
import { escape } from 'underscore';
import { escape as esc } from 'lodash';
import ancestorsTree from 'ee/sidebar/components/ancestors_tree/ancestors_tree.vue';
import mountComponent from 'helpers/vue_mount_component_helper';
......@@ -57,7 +57,7 @@ describe('AncestorsTreeContainer', () => {
it('escapes html in the tooltip', () => {
const title = '<script>alert(1);</script>';
const escapedTitle = escape(title);
const escapedTitle = esc(title);
vm.$props.ancestors = [{ id: 1, url: '', title, state: 'open' }];
......
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