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
f2c902d3
Commit
f2c902d3
authored
Oct 04, 2019
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usage of new names
parent
7c73f9d3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+3
-3
ee/spec/models/ci/build_spec.rb
ee/spec/models/ci/build_spec.rb
+1
-1
ee/spec/models/ci/pipeline_spec.rb
ee/spec/models/ci/pipeline_spec.rb
+1
-1
No files found.
ee/app/models/ee/ci/build.rb
View file @
f2c902d3
...
...
@@ -61,16 +61,16 @@ module EE
end
end
def
collect_license_scanning_reports!
(
license_
management
_report
)
def
collect_license_scanning_reports!
(
license_
scanning
_report
)
each_report
(
::
Ci
::
JobArtifact
::
LICENSE_MANAGEMENT_REPORT_FILE_TYPES
)
do
|
file_type
,
blob
|
next
if
::
Feature
.
disabled?
(
:parse_license_management_reports
,
default_enabled:
true
)
next
unless
project
.
feature_available?
(
:license_management
)
::
Gitlab
::
Ci
::
Parsers
.
fabricate!
(
file_type
).
parse!
(
blob
,
license_
management
_report
)
::
Gitlab
::
Ci
::
Parsers
.
fabricate!
(
file_type
).
parse!
(
blob
,
license_
scanning
_report
)
end
license_
management
_report
license_
scanning
_report
end
def
collect_dependency_list_reports!
(
dependency_list_report
)
...
...
ee/spec/models/ci/build_spec.rb
View file @
f2c902d3
...
...
@@ -170,7 +170,7 @@ describe Ci::Build do
end
end
describe
'#collect_license_
management
_reports!'
do
describe
'#collect_license_
scanning
_reports!'
do
subject
{
job
.
collect_license_scanning_reports!
(
license_scanning_report
)
}
let
(
:license_scanning_report
)
{
Gitlab
::
Ci
::
Reports
::
LicenseScanning
::
Report
.
new
}
...
...
ee/spec/models/ci/pipeline_spec.rb
View file @
f2c902d3
...
...
@@ -239,7 +239,7 @@ describe Ci::Pipeline do
end
end
describe
'#license_
management
_reports'
do
describe
'#license_
scanning
_reports'
do
subject
{
pipeline
.
license_scanning_report
}
before
do
...
...
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