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
b6e82971
Commit
b6e82971
authored
Jul 16, 2020
by
mfluharty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use super to avoid duplication
In associated_file_types_for and batch_lookup_report_artifact_for_file_type
parent
785a6201
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
ee/app/models/ee/ci/job_artifact.rb
ee/app/models/ee/ci/job_artifact.rb
+7
-3
ee/app/models/ee/ci/pipeline.rb
ee/app/models/ee/ci/pipeline.rb
+1
-5
No files found.
ee/app/models/ee/ci/job_artifact.rb
View file @
b6e82971
...
...
@@ -61,13 +61,17 @@ module EE
scope
:coverage_fuzzing
,
->
do
with_file_types
(
COVERAGE_FUZZING_REPORT_TYPES
)
end
end
class_methods
do
extend
::
Gitlab
::
Utils
::
Override
def
self
.
associated_file_types_for
(
file_type
)
return
unless
file_types
.
include?
(
file_type
)
override
:associated_file_types_for
def
associated_file_types_for
(
file_type
)
return
LICENSE_SCANNING_REPORT_FILE_TYPES
if
LICENSE_SCANNING_REPORT_FILE_TYPES
.
include?
(
file_type
)
return
BROWSER_PERFORMANCE_REPORT_FILE_TYPES
if
BROWSER_PERFORMANCE_REPORT_FILE_TYPES
.
include?
(
file_type
)
[
file_type
]
super
end
end
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
b6e82971
...
...
@@ -94,11 +94,7 @@ module EE
def
batch_lookup_report_artifact_for_file_type
(
file_type
)
return
unless
available_licensed_report_type?
(
file_type
)
latest_report_artifacts
.
values_at
(
*::
Ci
::
JobArtifact
.
associated_file_types_for
(
file_type
.
to_s
))
.
flatten
.
compact
.
last
super
end
def
expose_license_scanning_data?
...
...
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