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
717dd09f
Commit
717dd09f
authored
Sep 09, 2020
by
Kyle Mann
Committed by
Mark Florian
Sep 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated button from vulnerability page
Addresses
https://gitlab.com/gitlab-org/gitlab/-/issues/219765
.
parent
5a268044
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
...avascripts/vulnerabilities/components/history_comment.vue
+8
-4
ee/spec/frontend/vulnerabilities/history_comment_spec.js
ee/spec/frontend/vulnerabilities/history_comment_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
View file @
717dd09f
<
script
>
<
script
>
import
{
Gl
DeprecatedButton
,
Gl
Button
,
GlSafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlSafeHtmlDirective
as
SafeHtml
}
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
'
;
...
@@ -8,7 +8,6 @@ import HistoryCommentEditor from './history_comment_editor.vue';
...
@@ -8,7 +8,6 @@ import HistoryCommentEditor from './history_comment_editor.vue';
export
default
{
export
default
{
components
:
{
components
:
{
GlDeprecatedButton
,
GlButton
,
GlButton
,
EventItem
,
EventItem
,
HistoryCommentEditor
,
HistoryCommentEditor
,
...
@@ -180,8 +179,13 @@ export default {
...
@@ -180,8 +179,13 @@ export default {
</event-item>
</event-item>
<div
v-else
class=
"discussion-reply-holder"
>
<div
v-else
class=
"discussion-reply-holder"
>
<gl-deprecated-button
ref=
"addCommentButton"
class=
"btn-text-field"
@
click=
"showCommentInput"
>
<button
ref=
"addCommentButton"
class=
"btn btn-text-field"
type=
"button"
@
click=
"showCommentInput"
>
{{ s__('vulnerability|Add a comment') }}
{{ s__('vulnerability|Add a comment') }}
</
gl-deprecated-
button>
</button>
</div>
</div>
</template>
</template>
ee/spec/frontend/vulnerabilities/history_comment_spec.js
View file @
717dd09f
...
@@ -64,7 +64,7 @@ describe('History Comment', () => {
...
@@ -64,7 +64,7 @@ describe('History Comment', () => {
// whichever one exists and click it to show the editor.
// whichever one exists and click it to show the editor.
const
showEditView
=
()
=>
{
const
showEditView
=
()
=>
{
if
(
addCommentButton
().
exists
())
{
if
(
addCommentButton
().
exists
())
{
addCommentButton
().
vm
.
$emit
(
'
click
'
);
addCommentButton
().
trigger
(
'
click
'
);
}
else
{
}
else
{
editButton
().
vm
.
$emit
(
'
click
'
);
editButton
().
vm
.
$emit
(
'
click
'
);
}
}
...
...
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