Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
08ab9284
Commit
08ab9284
authored
Mar 26, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace underscore with lodash in ancestors_tree
parent
09762c21
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/assets/javascripts/sidebar/components/ancestors_tree/ancestors_tree.vue
...ipts/sidebar/components/ancestors_tree/ancestors_tree.vue
+2
-2
ee/spec/frontend/sidebar/ee_ancestor_tree_spec.js
ee/spec/frontend/sidebar/ee_ancestor_tree_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/sidebar/components/ancestors_tree/ancestors_tree.vue
View file @
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
=
esc
ape
(
title
);
title
=
esc
(
title
);
const
{
humanReadableEndDate
,
humanReadableTimestamp
}
=
immediateParent
;
...
...
ee/spec/frontend/sidebar/ee_ancestor_tree_spec.js
View file @
08ab9284
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
=
esc
ape
(
title
);
const
escapedTitle
=
esc
(
title
);
vm
.
$props
.
ancestors
=
[{
id
:
1
,
url
:
''
,
title
,
state
:
'
open
'
}];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment