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
2ebe88e7
Commit
2ebe88e7
authored
Oct 27, 2020
by
Fabio Pitino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make finders of report builds consistent across report types
parent
7b884854
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
ee/app/models/ee/ci/pipeline.rb
ee/app/models/ee/ci/pipeline.rb
+6
-6
No files found.
app/models/ci/pipeline.rb
View file @
2ebe88e7
...
...
@@ -926,7 +926,7 @@ module Ci
def
accessibility_reports
Gitlab
::
Ci
::
Reports
::
AccessibilityReports
.
new
.
tap
do
|
accessibility_reports
|
builds
.
latest
.
with_report
s
(
Ci
::
JobArtifact
.
accessibility_reports
).
each
do
|
build
|
latest_report_build
s
(
Ci
::
JobArtifact
.
accessibility_reports
).
each
do
|
build
|
build
.
collect_accessibility_reports!
(
accessibility_reports
)
end
end
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
2ebe88e7
...
...
@@ -107,7 +107,7 @@ module EE
reports_scope
=
report_types
.
empty?
?
::
Ci
::
JobArtifact
.
security_reports
:
::
Ci
::
JobArtifact
.
security_reports
(
file_types:
report_types
)
::
Gitlab
::
Ci
::
Reports
::
Security
::
Reports
.
new
(
self
).
tap
do
|
security_reports
|
builds
.
latest
.
with_report
s
(
reports_scope
).
each
do
|
build
|
latest_report_build
s
(
reports_scope
).
each
do
|
build
|
build
.
collect_security_reports!
(
security_reports
)
end
end
...
...
@@ -115,7 +115,7 @@ module EE
def
license_scanning_report
::
Gitlab
::
Ci
::
Reports
::
LicenseScanning
::
Report
.
new
.
tap
do
|
license_management_report
|
builds
.
latest
.
with_report
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
each
do
|
build
|
latest_report_build
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
each
do
|
build
|
build
.
collect_license_scanning_reports!
(
license_management_report
)
end
end
...
...
@@ -123,10 +123,10 @@ module EE
def
dependency_list_report
::
Gitlab
::
Ci
::
Reports
::
DependencyList
::
Report
.
new
.
tap
do
|
dependency_list_report
|
builds
.
latest
.
with_report
s
(
::
Ci
::
JobArtifact
.
dependency_list_reports
).
each
do
|
build
|
latest_report_build
s
(
::
Ci
::
JobArtifact
.
dependency_list_reports
).
each
do
|
build
|
build
.
collect_dependency_list_reports!
(
dependency_list_report
)
end
builds
.
latest
.
with_report
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
each
do
|
build
|
latest_report_build
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
each
do
|
build
|
build
.
collect_licenses_for_dependency_list!
(
dependency_list_report
)
end
end
...
...
@@ -134,7 +134,7 @@ module EE
def
metrics_report
::
Gitlab
::
Ci
::
Reports
::
Metrics
::
Report
.
new
.
tap
do
|
metrics_report
|
builds
.
latest
.
with_report
s
(
::
Ci
::
JobArtifact
.
metrics_reports
).
each
do
|
build
|
latest_report_build
s
(
::
Ci
::
JobArtifact
.
metrics_reports
).
each
do
|
build
|
build
.
collect_metrics_reports!
(
metrics_report
)
end
end
...
...
@@ -168,7 +168,7 @@ module EE
end
def
license_scan_completed?
builds
.
latest
.
with_report
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
exists?
latest_report_build
s
(
::
Ci
::
JobArtifact
.
license_scanning_reports
).
exists?
end
def
can_store_security_reports?
...
...
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