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
0eda4548
Commit
0eda4548
authored
Dec 02, 2019
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace usage of dependency_list feature
parent
81132171
Changes
3
Show 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
+2
-2
ee/spec/models/ci/build_spec.rb
ee/spec/models/ci/build_spec.rb
+2
-2
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 @
0eda4548
...
...
@@ -72,7 +72,7 @@ module EE
end
def
collect_dependency_list_reports!
(
dependency_list_report
)
if
project
.
feature_available?
(
:dependency_
list
)
if
project
.
feature_available?
(
:dependency_
scanning
)
dependency_list
=
::
Gitlab
::
Ci
::
Parsers
::
Security
::
DependencyList
.
new
(
project
,
sha
)
each_report
(
::
Ci
::
JobArtifact
::
DEPENDENCY_LIST_REPORT_FILE_TYPES
)
do
|
file_type
,
blob
|
...
...
@@ -84,7 +84,7 @@ module EE
end
def
collect_licenses_for_dependency_list!
(
dependency_list_report
)
if
project
.
feature_available?
(
:dependency_
list
)
if
project
.
feature_available?
(
:dependency_
scanning
)
dependency_list
=
::
Gitlab
::
Ci
::
Parsers
::
Security
::
DependencyList
.
new
(
project
,
sha
)
each_report
(
::
Ci
::
JobArtifact
::
LICENSE_MANAGEMENT_REPORT_FILE_TYPES
)
do
|
file_type
,
blob
|
...
...
ee/spec/models/ci/build_spec.rb
View file @
0eda4548
...
...
@@ -240,7 +240,7 @@ describe Ci::Build do
context
'with available licensed feature'
do
before
do
stub_licensed_features
(
dependency_
list
:
true
)
stub_licensed_features
(
dependency_
scanning
:
true
)
end
it
'parses blobs and add the results to the report'
do
...
...
@@ -277,7 +277,7 @@ describe Ci::Build do
context
'with available licensed feature'
do
before
do
stub_licensed_features
(
dependency_
list
:
true
)
stub_licensed_features
(
dependency_
scanning
:
true
)
end
it
'parses blobs and add found license'
do
...
...
ee/spec/models/ci/pipeline_spec.rb
View file @
0eda4548
...
...
@@ -277,7 +277,7 @@ describe Ci::Pipeline do
subject
{
pipeline
.
dependency_list_report
}
before
do
stub_licensed_features
(
dependency_
list
:
true
)
stub_licensed_features
(
dependency_
scanning
:
true
)
end
context
'when pipeline has a build with dependency list reports'
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