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
9fd0d234
Commit
9fd0d234
authored
Oct 22, 2020
by
Marcin Sedlak-Jakubowski
Committed by
Ezekiel Kigbo
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate toggle replies widget from Bootstrap to GlButton
parent
9e33d482
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
app/assets/javascripts/notes/components/toggle_replies_widget.vue
...ts/javascripts/notes/components/toggle_replies_widget.vue
+7
-5
changelogs/unreleased/msj-migrate-toggle-replies-widget.yml
changelogs/unreleased/msj-migrate-toggle-replies-widget.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/toggle_replies_widget.vue
View file @
9fd0d234
<
script
>
<
script
>
import
{
uniqBy
}
from
'
lodash
'
;
import
{
uniqBy
}
from
'
lodash
'
;
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
Gl
Button
,
Gl
Icon
}
from
'
@gitlab/ui
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
GlButton
,
GlIcon
,
GlIcon
,
UserAvatarLink
,
UserAvatarLink
,
TimeAgoTooltip
,
TimeAgoTooltip
,
...
@@ -57,14 +58,15 @@ export default {
...
@@ -57,14 +58,15 @@ export default {
tooltip-placement=
"bottom"
tooltip-placement=
"bottom"
/>
/>
</div>
</div>
<button
<gl-button
class=
"btn btn-link js-replies-text"
class=
"js-replies-text"
category=
"tertiary"
variant=
"link"
data-qa-selector=
"expand_replies_button"
data-qa-selector=
"expand_replies_button"
type=
"button"
@
click=
"toggle"
@
click=
"toggle"
>
>
{{
replies
.
length
}}
{{
n__
(
'
reply
'
,
'
replies
'
,
replies
.
length
)
}}
{{
replies
.
length
}}
{{
n__
(
'
reply
'
,
'
replies
'
,
replies
.
length
)
}}
</button>
</
gl-
button>
{{
__
(
'
Last reply by
'
)
}}
{{
__
(
'
Last reply by
'
)
}}
<a
:href=
"lastReply.author.path"
class=
"btn btn-link author-link"
>
<a
:href=
"lastReply.author.path"
class=
"btn btn-link author-link"
>
{{
lastReply
.
author
.
name
}}
{{
lastReply
.
author
.
name
}}
...
...
changelogs/unreleased/msj-migrate-toggle-replies-widget.yml
0 → 100644
View file @
9fd0d234
---
title
:
Migrate toggle replies widget from Bootstrap to GlButton
merge_request
:
45780
author
:
type
:
other
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