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
7e670000
Commit
7e670000
authored
Jul 02, 2019
by
Denys Mishunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hid re-named entries in subfolders
parent
9ae25ed1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
app/assets/javascripts/vue_shared/components/file_row.vue
app/assets/javascripts/vue_shared/components/file_row.vue
+1
-1
spec/javascripts/vue_shared/components/file_row_spec.js
spec/javascripts/vue_shared/components/file_row_spec.js
+13
-0
No files found.
app/assets/javascripts/vue_shared/components/file_row.vue
View file @
7e670000
...
@@ -131,7 +131,7 @@ export default {
...
@@ -131,7 +131,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div>
<div
v-if=
"!file.moved"
>
<file-header
v-if=
"file.isHeader"
:path=
"file.path"
/>
<file-header
v-if=
"file.isHeader"
:path=
"file.path"
/>
<div
<div
v-else
v-else
...
...
spec/javascripts/vue_shared/components/file_row_spec.js
View file @
7e670000
...
@@ -90,6 +90,19 @@ describe('File row component', () => {
...
@@ -90,6 +90,19 @@ describe('File row component', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.js-file-row-header
'
)).
not
.
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-file-row-header
'
)).
not
.
toBe
(
null
);
});
});
it
(
'
is not rendered for `moved` entries in subfolders
'
,
()
=>
{
createComponent
({
file
:
{
path
:
'
t5
'
,
moved
:
true
,
tree
:
[],
},
level
:
2
,
});
expect
(
vm
.
$el
.
nodeType
).
not
.
toEqual
(
1
);
});
describe
(
'
new dropdown
'
,
()
=>
{
describe
(
'
new dropdown
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
({
createComponent
({
...
...
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