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
7fa5f413
Commit
7fa5f413
authored
Apr 03, 2020
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename LicenseCompliance module
`license_management` name is deprecated
parent
972e5e68
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/finders/security/license_compliance_jobs_finder.rb
ee/app/finders/security/license_compliance_jobs_finder.rb
+2
-2
ee/app/presenters/projects/security/configuration_presenter.rb
...p/presenters/projects/security/configuration_presenter.rb
+2
-2
ee/spec/finders/security/license_compliance_jobs_finder_spec.rb
...c/finders/security/license_compliance_jobs_finder_spec.rb
+1
-1
No files found.
ee/app/finders/security/license_
management
_jobs_finder.rb
→
ee/app/finders/security/license_
compliance
_jobs_finder.rb
View file @
7fa5f413
# frozen_string_literal: true
# frozen_string_literal: true
# Security::License
Management
JobsFinder
# Security::License
Scanning
JobsFinder
#
#
# Used to find jobs (builds) that are related to the License Management.
# Used to find jobs (builds) that are related to the License Management.
#
#
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
# job_types: required, array of job types that should be returned, defaults to all job types
# job_types: required, array of job types that should be returned, defaults to all job types
module
Security
module
Security
class
License
Management
JobsFinder
<
JobsFinder
class
License
Compliance
JobsFinder
<
JobsFinder
def
self
.
allowed_job_types
def
self
.
allowed_job_types
[
:license_management
,
:license_scanning
]
[
:license_management
,
:license_scanning
]
end
end
...
...
ee/app/presenters/projects/security/configuration_presenter.rb
View file @
7fa5f413
...
@@ -77,7 +77,7 @@ module Projects
...
@@ -77,7 +77,7 @@ module Projects
return
[]
unless
latest_default_branch_pipeline
return
[]
unless
latest_default_branch_pipeline
::
Security
::
SecurityJobsFinder
.
new
(
pipeline:
latest_default_branch_pipeline
).
execute
+
::
Security
::
SecurityJobsFinder
.
new
(
pipeline:
latest_default_branch_pipeline
).
execute
+
::
Security
::
License
Management
JobsFinder
.
new
(
pipeline:
latest_default_branch_pipeline
).
execute
::
Security
::
License
Compliance
JobsFinder
.
new
(
pipeline:
latest_default_branch_pipeline
).
execute
end
end
def
latest_default_branch_pipeline
def
latest_default_branch_pipeline
...
@@ -123,7 +123,7 @@ module Projects
...
@@ -123,7 +123,7 @@ module Projects
end
end
def
scan_types
def
scan_types
::
Security
::
SecurityJobsFinder
.
allowed_job_types
+
::
Security
::
License
Management
JobsFinder
.
allowed_job_types
::
Security
::
SecurityJobsFinder
.
allowed_job_types
+
::
Security
::
License
Compliance
JobsFinder
.
allowed_job_types
end
end
end
end
end
end
...
...
ee/spec/finders/security/license_
management
_jobs_finder_spec.rb
→
ee/spec/finders/security/license_
compliance
_jobs_finder_spec.rb
View file @
7fa5f413
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
require
'spec_helper'
require
'spec_helper'
describe
Security
::
License
Management
JobsFinder
do
describe
Security
::
License
Compliance
JobsFinder
do
it_behaves_like
::
Security
::
JobsFinder
,
described_class
.
allowed_job_types
it_behaves_like
::
Security
::
JobsFinder
,
described_class
.
allowed_job_types
describe
"#execute"
do
describe
"#execute"
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