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
5a5b9ec3
Commit
5a5b9ec3
authored
Oct 04, 2019
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename collect license management reports
parent
9b4313cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+1
-1
ee/app/models/ee/ci/pipeline.rb
ee/app/models/ee/ci/pipeline.rb
+1
-1
ee/spec/models/ci/build_spec.rb
ee/spec/models/ci/build_spec.rb
+1
-1
No files found.
ee/app/models/ee/ci/build.rb
View file @
5a5b9ec3
...
...
@@ -61,7 +61,7 @@ module EE
end
end
def
collect_license_
management
_reports!
(
license_management_report
)
def
collect_license_
scanning
_reports!
(
license_management_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
)
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
5a5b9ec3
...
...
@@ -136,7 +136,7 @@ module EE
def
license_management_report
::
Gitlab
::
Ci
::
Reports
::
LicenseScanning
::
Report
.
new
.
tap
do
|
license_management_report
|
builds
.
latest
.
with_reports
(
::
Ci
::
JobArtifact
.
license_management_reports
).
each
do
|
build
|
build
.
collect_license_
management
_reports!
(
license_management_report
)
build
.
collect_license_
scanning
_reports!
(
license_management_report
)
end
end
end
...
...
ee/spec/models/ci/build_spec.rb
View file @
5a5b9ec3
...
...
@@ -171,7 +171,7 @@ describe Ci::Build do
end
describe
'#collect_license_management_reports!'
do
subject
{
job
.
collect_license_
management
_reports!
(
license_scanning_report
)
}
subject
{
job
.
collect_license_
scanning
_reports!
(
license_scanning_report
)
}
let
(
:license_scanning_report
)
{
Gitlab
::
Ci
::
Reports
::
LicenseScanning
::
Report
.
new
}
...
...
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