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
2a5db75f
Commit
2a5db75f
authored
Sep 24, 2020
by
Alan (Maciej) Paruszewski
Committed by
Kushal Pandya
Sep 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add reverting vulnerability to detected on single vulnerability page
parent
391b1076
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
2 deletions
+22
-2
ee/app/assets/javascripts/vulnerabilities/components/vulnerability_state_dropdown.vue
...lnerabilities/components/vulnerability_state_dropdown.vue
+1
-1
ee/app/assets/javascripts/vulnerabilities/constants.js
ee/app/assets/javascripts/vulnerabilities/constants.js
+7
-0
ee/changelogs/unreleased/230558-add-reverting-vulnerability-on-vulnerability-page.yml
...558-add-reverting-vulnerability-on-vulnerability-page.yml
+6
-0
ee/spec/frontend/vulnerabilities/status_description_spec.js
ee/spec/frontend/vulnerabilities/status_description_spec.js
+2
-1
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
ee/app/assets/javascripts/vulnerabilities/components/vulnerability_state_dropdown.vue
View file @
2a5db75f
...
...
@@ -58,7 +58,7 @@ export default {
<
template
>
<gl-deprecated-dropdown
ref=
"dropdown"
menu-class=
"
p-0
"
menu-class=
"
gl-p-0 dropdown-extended-height
"
toggle-class=
"text-capitalize"
:text=
"initialState"
:right=
"true"
...
...
ee/app/assets/javascripts/vulnerabilities/constants.js
View file @
2a5db75f
import
{
s__
}
from
'
~/locale
'
;
export
const
VULNERABILITY_STATE_OBJECTS
=
{
detected
:
{
action
:
'
revert
'
,
state
:
'
detected
'
,
statusBoxStyle
:
'
expired
'
,
displayName
:
s__
(
'
VulnerabilityManagement|Detected
'
),
description
:
s__
(
'
VulnerabilityManagement|Needs triage
'
),
},
dismissed
:
{
action
:
'
dismiss
'
,
state
:
'
dismissed
'
,
...
...
ee/changelogs/unreleased/230558-add-reverting-vulnerability-on-vulnerability-page.yml
0 → 100644
View file @
2a5db75f
---
title
:
Add ability to revert vulnerability to detected state on single vulnerability
page
merge_request
:
41794
author
:
type
:
added
ee/spec/frontend/vulnerabilities/status_description_spec.js
View file @
2a5db75f
...
...
@@ -11,7 +11,8 @@ import { VULNERABILITY_STATE_OBJECTS, VULNERABILITY_STATES } from 'ee/vulnerabil
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
const
NON_DETECTED_STATES
=
Object
.
keys
(
VULNERABILITY_STATE_OBJECTS
);
const
{
detected
,
...
NON_DETECTED_STATE_OBJECTS
}
=
VULNERABILITY_STATE_OBJECTS
;
const
NON_DETECTED_STATES
=
Object
.
keys
(
NON_DETECTED_STATE_OBJECTS
);
const
ALL_STATES
=
Object
.
keys
(
VULNERABILITY_STATES
);
describe
(
'
Vulnerability status description component
'
,
()
=>
{
...
...
locale/gitlab.pot
View file @
2a5db75f
...
...
@@ -27831,6 +27831,12 @@ msgstr ""
msgid "VulnerabilityManagement|Could not process %{issueReference}: %{errorMessage}."
msgstr ""
msgid "VulnerabilityManagement|Detected"
msgstr ""
msgid "VulnerabilityManagement|Needs triage"
msgstr ""
msgid "VulnerabilityManagement|Something went wrong while trying to delete the comment. Please try again later."
msgstr ""
...
...
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