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
50165bfa
Commit
50165bfa
authored
Apr 09, 2021
by
Taurie Davis
Committed by
Miguel Rincon
Apr 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated button classes from issue detail view
parent
2eae06f8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
9 deletions
+12
-9
app/assets/javascripts/issue_show/components/header_actions.vue
...sets/javascripts/issue_show/components/header_actions.vue
+0
-2
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+3
-3
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+1
-1
app/views/shared/notes/_comment_button.html.haml
app/views/shared/notes/_comment_button.html.haml
+1
-1
changelogs/unreleased/issue-detail-view-deprecated-button.yml
...gelogs/unreleased/issue-detail-view-deprecated-button.yml
+5
-0
spec/features/merge_request/user_posts_notes_spec.rb
spec/features/merge_request/user_posts_notes_spec.rb
+2
-2
No files found.
app/assets/javascripts/issue_show/components/header_actions.vue
View file @
50165bfa
...
...
@@ -25,7 +25,6 @@ export default {
},
actionPrimary
:
{
text
:
__
(
'
Yes, close issue
'
),
attributes
:
[{
variant
:
'
warning
'
}],
},
i18n
:
{
promoteErrorMessage
:
__
(
...
...
@@ -220,7 +219,6 @@ export default {
<gl-button
v-if=
"showToggleIssueStateButton"
class=
"gl-display-none gl-sm-display-inline-flex!"
category=
"secondary"
:data-qa-selector=
"qaSelector"
:loading=
"isToggleStateButtonLoading"
@
click=
"toggleIssueState"
...
...
app/assets/javascripts/notes/components/note_actions.vue
View file @
50165bfa
...
...
@@ -336,7 +336,7 @@ export default {
icon=
"pencil"
size=
"small"
category=
"tertiary"
class=
"note-action-button js-note-edit
btn btn-transparent
"
class=
"note-action-button js-note-edit"
data-qa-selector=
"note_edit_button"
@
click=
"onEdit"
/>
...
...
@@ -348,7 +348,7 @@ export default {
size=
"small"
icon=
"remove"
category=
"tertiary"
class=
"note-action-button js-note-delete
btn btn-transparent
"
class=
"note-action-button js-note-delete"
@
click=
"onDelete"
/>
<div
v-else-if=
"shouldShowActionsDropdown"
class=
"dropdown more-actions"
>
...
...
@@ -359,7 +359,7 @@ export default {
icon=
"ellipsis_v"
size=
"small"
category=
"tertiary"
class=
"note-action-button more-actions-toggle
btn btn-transparent
"
class=
"note-action-button more-actions-toggle"
data-toggle=
"dropdown"
@
click=
"closeTooltip"
/>
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
50165bfa
...
...
@@ -424,7 +424,7 @@ export default {
<gl-button
:disabled=
"isDisabled"
category=
"primary"
variant=
"
success
"
variant=
"
confirm
"
data-qa-selector=
"reply_comment_button"
class=
"gl-mr-3 js-vue-issue-save js-comment-button"
@
click=
"handleUpdate()"
...
...
app/views/shared/notes/_comment_button.html.haml
View file @
50165bfa
...
...
@@ -4,7 +4,7 @@
%input
.btn.gl-button.btn-confirm.js-comment-button.js-comment-submit-button
{
type:
'submit'
,
value:
_
(
'Comment'
),
data:
{
qa_selector:
'comment_button'
}
}
-
if
@note
.
can_be_discussion_note?
=
button_tag
type:
'button'
,
class:
'gl-button btn dropdown-toggle btn-confirm
btn-icon
js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
button_tag
type:
'button'
,
class:
'gl-button btn dropdown-toggle btn-confirm js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
sprite_icon
(
'chevron-down'
)
%ul
#resolvable-comment-menu
.dropdown-menu.dropdown-open-top
{
data:
{
dropdown:
true
}
}
...
...
changelogs/unreleased/issue-detail-view-deprecated-button.yml
0 → 100644
View file @
50165bfa
---
title
:
Remove deprecated button classes from issue detail view
merge_request
:
57763
author
:
type
:
changed
spec/features/merge_request/user_posts_notes_spec.rb
View file @
50165bfa
...
...
@@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
it
'allows using markdown buttons after saving a note and then trying to edit it again'
do
page
.
within
(
'.current-note-edit-form'
)
do
fill_in
'note[note]'
,
with:
'This is the new content'
find
(
'.btn-
success
'
).
click
find
(
'.btn-
confirm
'
).
click
end
find
(
'.note'
).
hover
...
...
@@ -191,7 +191,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
it
'appends the edited at time to the note'
do
page
.
within
(
'.current-note-edit-form'
)
do
fill_in
'note[note]'
,
with:
'Some new content'
find
(
'.btn-
success
'
).
click
find
(
'.btn-
confirm
'
).
click
end
page
.
within
(
"#note_
#{
note
.
id
}
"
)
do
...
...
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