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
2b357bb5
Commit
2b357bb5
authored
May 17, 2019
by
Mark Chao
Committed by
Achilleas Pipinellis
May 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update links to new security docs
Related to
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5566
parent
9a5f0b62
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
17 deletions
+16
-17
ee/app/helpers/ee/projects_helper.rb
ee/app/helpers/ee/projects_helper.rb
+5
-5
ee/app/views/projects/merge_requests/show.html.haml
ee/app/views/projects/merge_requests/show.html.haml
+5
-5
ee/app/views/projects/pipelines/_tabs_content.html.haml
ee/app/views/projects/pipelines/_tabs_content.html.haml
+5
-5
ee/spec/javascripts/vue_mr_widget/mock_data.js
ee/spec/javascripts/vue_mr_widget/mock_data.js
+1
-2
No files found.
ee/app/helpers/ee/projects_helper.rb
View file @
2b357bb5
...
...
@@ -189,11 +189,11 @@ module EE
sast_container_head_path:
pipeline
.
downloadable_path_for_report_type
(
:container_scanning
),
vulnerability_feedback_path:
project_vulnerability_feedback_index_path
(
project
),
pipeline_id:
pipeline
.
id
,
vulnerability_feedback_help_path:
help_page_path
(
"user/project/merge_requests/index"
,
anchor:
"interacting-with-security-reports-ultimate"
),
sast_help_path:
help_page_path
(
'user/
project/merge_requests/sast
'
),
dependency_scanning_help_path:
help_page_path
(
'user/
project/merge_requests/dependency_scanning
'
),
dast_help_path:
help_page_path
(
'user/
project/merge_requests/dast
'
),
sast_container_help_path:
help_page_path
(
'user/
project/merge_requests/container_scanning
'
),
vulnerability_feedback_help_path:
help_page_path
(
'user/application_security/index'
),
sast_help_path:
help_page_path
(
'user/
application_security/sast/index
'
),
dependency_scanning_help_path:
help_page_path
(
'user/
application_security/dependency_scanning/index
'
),
dast_help_path:
help_page_path
(
'user/
application_security/dast/index
'
),
sast_container_help_path:
help_page_path
(
'user/
application_security/container_scanning/index
'
),
user_path:
user_url
(
pipeline
.
user
),
user_avatar_path:
pipeline
.
user
.
avatar_url
,
user_name:
pipeline
.
user
.
name
,
...
...
ee/app/views/projects/merge_requests/show.html.haml
View file @
2b357bb5
...
...
@@ -9,9 +9,9 @@
// Object.assign would be useful here, but it blows up Phantom.js in tests
window
.
gl
.
mrWidgetData
.
is_geo_secondary_node
=
'
#{
Gitlab
::
Geo
.
secondary?
}
'
===
'
true
'
;
window
.
gl
.
mrWidgetData
.
geo_secondary_help_path
=
'
#{
help_page_path
(
"/gitlab-geo/configuration.md"
)
}
'
;
window
.
gl
.
mrWidgetData
.
sast_help_path
=
'
#{
help_page_path
(
"user/
project/merge_requests/sast
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
sast_container_help_path
=
'
#{
help_page_path
(
"user/
project/merge_requests/container_scanning
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
dast_help_path
=
'
#{
help_page_path
(
"user/
project/merge_requests/dast
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
dependency_scanning_help_path
=
'
#{
help_page_path
(
"user/
project/merge_requests/dependency_scanning
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
vulnerability_feedback_help_path
=
'
#{
help_page_path
(
"user/
project/merge_requests/index"
,
anchor:
"interacting-with-security-reports-ultimate
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
sast_help_path
=
'
#{
help_page_path
(
"user/
application_security/sast/index
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
sast_container_help_path
=
'
#{
help_page_path
(
"user/
application_security/container_scanning/index
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
dast_help_path
=
'
#{
help_page_path
(
"user/
application_security/dast/index
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
dependency_scanning_help_path
=
'
#{
help_page_path
(
"user/
application_security/dependency_scanning/index
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
vulnerability_feedback_help_path
=
'
#{
help_page_path
(
"user/
application_security/index
"
)
}
'
;
window
.
gl
.
mrWidgetData
.
approvals_help_path
=
'
#{
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
)
}
'
;
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
2b357bb5
...
...
@@ -18,11 +18,11 @@
pipeline_id:
pipeline
.
id
,
source_branch:
pipeline
.
ref
,
vulnerability_feedback_path:
project_vulnerability_feedback_index_path
(
project
),
vulnerability_feedback_help_path:
help_page_path
(
"user/project/merge_requests/index"
,
anchor:
"interacting-with-security-reports-ultimate"
),
sast_help_path:
help_page_path
(
'user/
project/merge_requests/sast
'
),
dependency_scanning_help_path:
help_page_path
(
'user/
project/merge_requests/dependency_scanning
'
),
dast_help_path:
help_page_path
(
'user/
project/merge_requests/dast
'
),
sast_container_help_path:
help_page_path
(
'user/
project/merge_requests/container_scanning
'
),
vulnerability_feedback_help_path:
help_page_path
(
'user/application_security/index'
),
sast_help_path:
help_page_path
(
'user/
application_security/sast/index
'
),
dependency_scanning_help_path:
help_page_path
(
'user/
application_security/dependency_scanning/index
'
),
dast_help_path:
help_page_path
(
'user/
application_security/dast/index
'
),
sast_container_help_path:
help_page_path
(
'user/
application_security/container_scanning/index
'
),
create_vulnerability_feedback_issue_path:
create_vulnerability_feedback_issue_path
(
project
),
create_vulnerability_feedback_merge_request_path:
create_vulnerability_feedback_merge_request_path
(
project
),
create_vulnerability_feedback_dismissal_path:
create_vulnerability_feedback_dismissal_path
(
project
)
}
}
...
...
ee/spec/javascripts/vue_mr_widget/mock_data.js
View file @
2b357bb5
...
...
@@ -9,8 +9,7 @@ export default Object.assign({}, mockData, {
base_path
:
'
blob_path
'
,
head_path
:
'
blob_path
'
,
},
vulnerability_feedback_help_path
:
'
/help/user/project/merge_requests/index#interacting-with-security-reports-ultimate
'
,
vulnerability_feedback_help_path
:
'
/help/user/application_security/index
'
,
});
// Codeclimate
...
...
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