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
93b7ce26
Commit
93b7ce26
authored
Aug 27, 2020
by
Daniel Tian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix vulnerability comment delete button spinner position
parent
f9087286
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
...avascripts/vulnerabilities/components/history_comment.vue
+2
-4
ee/changelogs/unreleased/222346-fix-delete-button-spinner.yml
...hangelogs/unreleased/222346-fix-delete-button-spinner.yml
+5
-0
ee/spec/frontend/vulnerabilities/history_comment_spec.js
ee/spec/frontend/vulnerabilities/history_comment_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
View file @
93b7ce26
<
script
>
<
script
>
/* eslint-disable vue/no-v-html */
/* eslint-disable vue/no-v-html */
import
{
GlDeprecatedButton
,
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlDeprecatedButton
,
GlButton
}
from
'
@gitlab/ui
'
;
import
EventItem
from
'
ee/vue_shared/security_reports/components/event_item.vue
'
;
import
EventItem
from
'
ee/vue_shared/security_reports/components/event_item.vue
'
;
import
{
deprecatedCreateFlash
as
createFlash
}
from
'
~/flash
'
;
import
{
deprecatedCreateFlash
as
createFlash
}
from
'
~/flash
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
...
@@ -13,7 +13,6 @@ export default {
...
@@ -13,7 +13,6 @@ export default {
GlButton
,
GlButton
,
EventItem
,
EventItem
,
HistoryCommentEditor
,
HistoryCommentEditor
,
GlLoadingIcon
,
},
},
props
:
{
props
:
{
...
@@ -161,10 +160,9 @@ export default {
...
@@ -161,10 +160,9 @@ export default {
<gl-button
<gl-button
ref=
"confirmDeleteButton"
ref=
"confirmDeleteButton"
variant=
"danger"
variant=
"danger"
:
disabled
=
"isDeletingComment"
:
loading
=
"isDeletingComment"
@
click=
"deleteComment"
@
click=
"deleteComment"
>
>
<gl-loading-icon
v-if=
"isDeletingComment"
class=
"mr-1"
/>
{{
__
(
'
Delete
'
)
}}
{{
__
(
'
Delete
'
)
}}
</gl-button>
</gl-button>
<gl-button
<gl-button
...
...
ee/changelogs/unreleased/222346-fix-delete-button-spinner.yml
0 → 100644
View file @
93b7ce26
---
title
:
Fix vulnerability comment delete button spinner position
merge_request
:
40681
author
:
type
:
fixed
ee/spec/frontend/vulnerabilities/history_comment_spec.js
View file @
93b7ce26
...
@@ -196,8 +196,8 @@ describe('History Comment', () => {
...
@@ -196,8 +196,8 @@ describe('History Comment', () => {
return
wrapper
.
vm
.
$nextTick
();
return
wrapper
.
vm
.
$nextTick
();
})
})
.
then
(()
=>
{
.
then
(()
=>
{
expect
(
confirmDeleteButton
().
attributes
(
'
disabled
'
)).
toBeTruthy
(
);
expect
(
confirmDeleteButton
().
props
(
'
loading
'
)).
toBe
(
true
);
expect
(
cancelDeleteButton
().
attributes
(
'
disabled
'
)).
toBeTruthy
(
);
expect
(
cancelDeleteButton
().
props
(
'
disabled
'
)).
toBe
(
true
);
return
axios
.
waitForAll
();
return
axios
.
waitForAll
();
})
})
.
then
(()
=>
{
.
then
(()
=>
{
...
...
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