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
4ea68d4a
Commit
4ea68d4a
authored
Jun 23, 2021
by
Dave Pisek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review feedback: Renaming, init function
parent
a7098dbb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
13 deletions
+11
-13
ee/app/assets/javascripts/security_dashboard/pipeline_init.js
...pp/assets/javascripts/security_dashboard/pipeline_init.js
+2
-2
ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/commit.vue
...ulnerabilities/components/generic_report/types/commit.vue
+4
-4
ee/app/assets/javascripts/vulnerabilities/vulnerabilities_init.js
...ssets/javascripts/vulnerabilities/vulnerabilities_init.js
+2
-4
ee/app/views/projects/pipelines/_tabs_content.html.haml
ee/app/views/projects/pipelines/_tabs_content.html.haml
+1
-1
ee/app/views/projects/security/vulnerabilities/show.html.haml
...pp/views/projects/security/vulnerabilities/show.html.haml
+1
-1
ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js
...ntend/vulnerabilities/generic_report/types/commit_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/security_dashboard/pipeline_init.js
View file @
4ea68d4a
...
...
@@ -23,7 +23,7 @@ export default () => {
vulnerabilitiesEndpoint
,
emptyStateUnauthorizedSvgPath
,
emptyStateForbiddenSvgPath
,
projectCommit
Path
,
commitBase
Path
,
projectFullPath
,
pipelineJobsPath
,
canAdminVulnerability
,
...
...
@@ -44,7 +44,7 @@ export default () => {
provide
:
{
dashboardType
:
DASHBOARD_TYPES
.
PIPELINE
,
projectId
:
parseInt
(
projectId
,
10
),
projectCommit
Path
,
commitBase
Path
,
projectFullPath
,
dashboardDocumentation
,
emptyStateSvgPath
,
...
...
ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/commit.vue
View file @
4ea68d4a
...
...
@@ -5,7 +5,7 @@ export default {
components
:
{
GlLink
,
},
inject
:
[
'
projectCommit
Path
'
],
inject
:
[
'
commitBase
Path
'
],
props
:
{
value
:
{
type
:
String
,
...
...
@@ -13,13 +13,13 @@ export default {
},
},
computed
:
{
linkToCommit
()
{
return
`
${
this
.
projectCommit
Path
}
/
${
this
.
value
}
`
;
commitPath
()
{
return
`
${
this
.
commitBase
Path
}
/
${
this
.
value
}
`
;
},
},
};
</
script
>
<
template
>
<gl-link
:href=
"
linkToCommit
"
>
{{
value
}}
</gl-link>
<gl-link
:href=
"
commitPath
"
>
{{
value
}}
</gl-link>
</
template
>
ee/app/assets/javascripts/vulnerabilities/vulnerabilities_init.js
View file @
4ea68d4a
...
...
@@ -8,9 +8,7 @@ export default (el) => {
return
null
;
}
const
{
vulnerability
:
rawVulnerability
,
projectCommitPath
}
=
el
.
dataset
;
const
vulnerability
=
convertObjectPropsToCamelCase
(
JSON
.
parse
(
rawVulnerability
),
{
const
vulnerability
=
convertObjectPropsToCamelCase
(
JSON
.
parse
(
el
.
dataset
.
vulnerability
),
{
deep
:
true
,
});
...
...
@@ -20,7 +18,7 @@ export default (el) => {
provide
:
{
reportType
:
vulnerability
.
reportType
,
newIssueUrl
:
vulnerability
.
newIssueUrl
,
projectCommit
Path
,
commitBasePath
:
el
.
dataset
.
commitBase
Path
,
projectFingerprint
:
vulnerability
.
projectFingerprint
,
projectFullPath
:
vulnerability
.
project
?.
fullPath
,
vulnerabilityId
:
vulnerability
.
id
,
...
...
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
4ea68d4a
...
...
@@ -21,7 +21,7 @@
empty_state_unauthorized_svg_path:
image_path
(
'illustrations/user-not-logged-in.svg'
),
empty_state_forbidden_svg_path:
image_path
(
'illustrations/lock_promotion.svg'
),
project_full_path:
project
.
path_with_namespace
,
project_commit
_path:
"#{project_path(project)}/-/commit"
,
commit_base
_path:
"#{project_path(project)}/-/commit"
,
can_admin_vulnerability:
can?
(
current_user
,
:admin_vulnerability
,
project
).
to_s
,
security_report_help_page_link:
help_page_path
(
'user/application_security/index'
,
anchor:
'security-report-validation'
)
}
}
...
...
ee/app/views/projects/security/vulnerabilities/show.html.haml
View file @
4ea68d4a
...
...
@@ -6,4 +6,4 @@
-
add_page_specific_style
'page_bundles/security_dashboard'
#js-vulnerability-main
{
data:
{
vulnerability:
vulnerability_details_json
(
@vulnerability
,
@pipeline
),
project_commit
_path:
"#{project_path(@vulnerability.project)}/-/commit"
}
}
commit_base
_path:
"#{project_path(@vulnerability.project)}/-/commit"
}
}
ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js
View file @
4ea68d4a
...
...
@@ -14,7 +14,7 @@ describe('ee/vulnerabilities/components/generic_report/types/commit.vue', () =>
return
shallowMount
(
Commit
,
{
propsData
:
TEST_DATA
,
provide
:
{
projectCommit
Path
:
TEST_PROJECT_COMMIT_PATH
,
commitBase
Path
:
TEST_PROJECT_COMMIT_PATH
,
},
});
};
...
...
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