Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab
Commits
5a5b9ec3
Unverified
Commit
5a5b9ec3
authored
5 years ago
by
Tetiana Chupryna
Browse files
Options
Downloads
Patches
Plain Diff
Rename collect license management reports
parent
9b4313cf
Loading
Loading
1 merge request
!18124
Rename license management in pipeline and build
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ee/app/models/ee/ci/build.rb
+1
-1
1 addition, 1 deletion
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/pipeline.rb
+1
-1
1 addition, 1 deletion
ee/app/models/ee/ci/pipeline.rb
ee/spec/models/ci/build_spec.rb
+1
-1
1 addition, 1 deletion
ee/spec/models/ci/build_spec.rb
with
3 additions
and
3 deletions
ee/app/models/ee/ci/build.rb
+
1
−
1
View file @
5a5b9ec3
...
...
@@ -61,7 +61,7 @@ def collect_security_reports!(security_reports)
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
)
...
...
This diff is collapsed.
Click to expand it.
ee/app/models/ee/ci/pipeline.rb
+
1
−
1
View file @
5a5b9ec3
...
...
@@ -136,7 +136,7 @@ def security_reports
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
...
...
This diff is collapsed.
Click to expand it.
ee/spec/models/ci/build_spec.rb
+
1
−
1
View file @
5a5b9ec3
...
...
@@ -171,7 +171,7 @@
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
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment