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
47cd0bc1
Commit
47cd0bc1
authored
Oct 14, 2020
by
Marvin Karegyeya
Committed by
Brandon Labuschagne
Oct 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gldeprecateddropdown to Gldropdown in breadcrumbs.vue
parent
9d239b1a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
16 deletions
+21
-16
app/assets/javascripts/repository/components/breadcrumbs.vue
app/assets/javascripts/repository/components/breadcrumbs.vue
+13
-13
changelogs/unreleased/Replace-GlDeprecatedDropdown-with-GlDropdown-in-app-assets-javascripts-re.yml
...Dropdown-with-GlDropdown-in-app-assets-javascripts-re.yml
+5
-0
spec/frontend/repository/components/breadcrumbs_spec.js
spec/frontend/repository/components/breadcrumbs_spec.js
+3
-3
No files found.
app/assets/javascripts/repository/components/breadcrumbs.vue
View file @
47cd0bc1
<
script
>
import
{
GlD
eprecatedD
ropdown
,
GlD
eprecatedD
ropdownDivider
,
GlD
eprecatedDropdow
nHeader
,
GlD
eprecatedD
ropdownItem
,
GlDropdown
,
GlDropdownDivider
,
GlD
ropdownSectio
nHeader
,
GlDropdownItem
,
GlIcon
,
}
from
'
@gitlab/ui
'
;
import
{
joinPaths
,
escapeFileUrl
}
from
'
~/lib/utils/url_utility
'
;
...
...
@@ -20,10 +20,10 @@ const ROW_TYPES = {
export
default
{
components
:
{
GlD
eprecatedD
ropdown
,
GlD
eprecatedD
ropdownDivider
,
GlD
eprecatedDropdow
nHeader
,
GlD
eprecatedD
ropdownItem
,
GlDropdown
,
GlDropdownDivider
,
GlD
ropdownSectio
nHeader
,
GlDropdownItem
,
GlIcon
,
},
apollo
:
{
...
...
@@ -226,11 +226,11 @@ export default {
getComponent
(
type
)
{
switch
(
type
)
{
case
ROW_TYPES
.
divider
:
return
'
gl-d
eprecated-d
ropdown-divider
'
;
return
'
gl-dropdown-divider
'
;
case
ROW_TYPES
.
header
:
return
'
gl-d
eprecated-dropdow
n-header
'
;
return
'
gl-d
ropdown-sectio
n-header
'
;
default
:
return
'
gl-d
eprecated-d
ropdown-item
'
;
return
'
gl-dropdown-item
'
;
}
},
},
...
...
@@ -246,7 +246,7 @@ export default {
</router-link>
</li>
<li
v-if=
"renderAddToTreeDropdown"
class=
"breadcrumb-item"
>
<gl-d
eprecated-dropdown
toggle-class=
"add-to-tree qa-add-to-tree ml-1
"
>
<gl-d
ropdown
toggle-class=
"add-to-tree qa-add-to-tree gl-ml-2
"
>
<template
#button-content
>
<span
class=
"sr-only"
>
{{
__
(
'
Add to tree
'
)
}}
</span>
<gl-icon
name=
"plus"
:size=
"16"
class=
"float-left"
/>
...
...
@@ -257,7 +257,7 @@ export default {
{{
item
.
text
}}
</component>
</
template
>
</gl-d
eprecated-d
ropdown>
</gl-dropdown>
</li>
</ol>
</nav>
...
...
changelogs/unreleased/Replace-GlDeprecatedDropdown-with-GlDropdown-in-app-assets-javascripts-re.yml
0 → 100644
View file @
47cd0bc1
---
title
:
Replace `GlDeprecatedDropdown` with `GlDropdown` in `app/assets/javascripts/repository/components/breadcrumbs.vue`
merge_request
:
41427
author
:
nuwe1
type
:
other
spec/frontend/repository/components/breadcrumbs_spec.js
View file @
47cd0bc1
import
{
shallowMount
,
RouterLinkStub
}
from
'
@vue/test-utils
'
;
import
{
GlD
eprecatedD
ropdown
}
from
'
@gitlab/ui
'
;
import
{
GlDropdown
}
from
'
@gitlab/ui
'
;
import
Breadcrumbs
from
'
~/repository/components/breadcrumbs.vue
'
;
let
vm
;
...
...
@@ -61,7 +61,7 @@ describe('Repository breadcrumbs component', () => {
vm
.
setData
({
userPermissions
:
{
forkProject
:
false
,
createMergeRequestIn
:
false
}
});
return
vm
.
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
find
(
GlD
eprecatedD
ropdown
).
exists
()).
toBe
(
false
);
expect
(
vm
.
find
(
GlDropdown
).
exists
()).
toBe
(
false
);
});
});
...
...
@@ -71,7 +71,7 @@ describe('Repository breadcrumbs component', () => {
vm
.
setData
({
userPermissions
:
{
forkProject
:
true
,
createMergeRequestIn
:
true
}
});
return
vm
.
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
find
(
GlD
eprecatedD
ropdown
).
exists
()).
toBe
(
true
);
expect
(
vm
.
find
(
GlDropdown
).
exists
()).
toBe
(
true
);
});
});
});
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