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
b2af99d6
Commit
b2af99d6
authored
Jul 27, 2020
by
Jeremy Elder
Committed by
Jose Ivan Vargas
Jul 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace GlDeprecatedButton with GlButton in sidebar datepicker
parent
63b2e6c4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_date_picker.vue
...pts/epic/components/sidebar_items/sidebar_date_picker.vue
+7
-6
ee/changelogs/unreleased/219819-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
...-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
+5
-0
ee/spec/frontend/epic/components/sidebar_items/__snapshots__/sidebar_date_picker_spec.js.snap
...ebar_items/__snapshots__/sidebar_date_picker_spec.js.snap
+5
-3
No files found.
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_date_picker.vue
View file @
b2af99d6
<
script
>
<
script
>
import
{
uniqueId
}
from
'
lodash
'
;
import
{
uniqueId
}
from
'
lodash
'
;
import
{
GlLoadingIcon
,
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
{
dateInWords
}
from
'
~/lib/utils/datetime_utility
'
;
import
{
dateInWords
}
from
'
~/lib/utils/datetime_utility
'
;
...
@@ -26,7 +26,7 @@ export default {
...
@@ -26,7 +26,7 @@ export default {
CollapsedCalendarIcon
,
CollapsedCalendarIcon
,
ToggleSidebar
,
ToggleSidebar
,
GlLoadingIcon
,
GlLoadingIcon
,
Gl
Deprecated
Button
,
GlButton
,
},
},
props
:
{
props
:
{
sidebarCollapsed
:
{
sidebarCollapsed
:
{
...
@@ -201,7 +201,7 @@ export default {
...
@@ -201,7 +201,7 @@ export default {
<gl-loading-icon
v-if=
"dateSaveInProgress"
:inline=
"true"
/>
<gl-loading-icon
v-if=
"dateSaveInProgress"
:inline=
"true"
/>
<div
class=
"float-right d-flex"
>
<div
class=
"float-right d-flex"
>
<icon
v-popover=
"popoverOptions"
name=
"question-o"
class=
"help-icon gl-mr-2"
tabindex=
"0"
/>
<icon
v-popover=
"popoverOptions"
name=
"question-o"
class=
"help-icon gl-mr-2"
tabindex=
"0"
/>
<gl-
deprecated-
button
<gl-button
v-show=
"canUpdate && !editing"
v-show=
"canUpdate && !editing"
ref=
"editButton"
ref=
"editButton"
variant=
"link"
variant=
"link"
...
@@ -209,7 +209,8 @@ export default {
...
@@ -209,7 +209,8 @@ export default {
@
click=
"startEditing"
@
click=
"startEditing"
>
>
{{
__
(
'
Edit
'
)
}}
{{
__
(
'
Edit
'
)
}}
</gl-deprecated-button>
</gl-button>
<toggle-sidebar
<toggle-sidebar
v-if=
"showToggleSidebar"
v-if=
"showToggleSidebar"
:collapsed=
"sidebarCollapsed"
:collapsed=
"sidebarCollapsed"
...
@@ -249,14 +250,14 @@ export default {
...
@@ -249,14 +250,14 @@ export default {
/>
/>
<span
v-if=
"selectedAndEditable"
class=
"no-value d-flex"
>
<span
v-if=
"selectedAndEditable"
class=
"no-value d-flex"
>
–
–
<gl-
deprecated-
button
<gl-button
ref=
"removeButton"
ref=
"removeButton"
variant=
"link"
variant=
"link"
class=
"btn-sidebar-date-remove"
class=
"btn-sidebar-date-remove"
@
click=
"newDateSelected(null)"
@
click=
"newDateSelected(null)"
>
>
{{
__
(
'
remove
'
)
}}
{{
__
(
'
remove
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</span>
</span>
</
template
>
</
template
>
<span
v-else
class=
"no-value"
>
{{ __('None') }}
</span>
<span
v-else
class=
"no-value"
>
{{ __('None') }}
</span>
...
...
ee/changelogs/unreleased/219819-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
0 → 100644
View file @
b2af99d6
---
title
:
Replace GlDeprecatedButton with GlButton
merge_request
:
37602
author
:
type
:
other
ee/spec/frontend/epic/components/sidebar_items/__snapshots__/sidebar_date_picker_spec.js.snap
View file @
b2af99d6
...
@@ -30,15 +30,17 @@ exports[`SidebarDatePicker renders expected template 1`] = `
...
@@ -30,15 +30,17 @@ exports[`SidebarDatePicker renders expected template 1`] = `
tabindex="0"
tabindex="0"
/>
/>
<gl-deprecated-button-stub
<gl-button-stub
category="tertiary"
class="btn-sidebar-action"
class="btn-sidebar-action"
size="md"
icon=""
size="medium"
variant="link"
variant="link"
>
>
Edit
Edit
</gl-
deprecated-
button-stub>
</gl-button-stub>
<!---->
<!---->
</div>
</div>
...
...
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