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
23d422b6
Commit
23d422b6
authored
May 15, 2020
by
Tetiana Chupryna
Committed by
Jan Provaznik
May 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove license_management licensed feature
We're dropping support in favour of license_scanning
parent
a46ef0ce
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
12 deletions
+11
-12
ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
+1
-1
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
+2
-2
ee/app/models/license.rb
ee/app/models/license.rb
+0
-1
ee/app/policies/ee/project_policy.rb
ee/app/policies/ee/project_policy.rb
+1
-1
ee/app/views/projects/merge_requests/show.html.haml
ee/app/views/projects/merge_requests/show.html.haml
+1
-1
ee/app/views/projects/pipelines/_tabs_content.html.haml
ee/app/views/projects/pipelines/_tabs_content.html.haml
+1
-1
ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
...views/projects/settings/ci_cd/_managed_licenses.html.haml
+1
-1
ee/spec/policies/project_policy_spec.rb
ee/spec/policies/project_policy_spec.rb
+2
-2
lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
...ab/ci/templates/Security/License-Management.gitlab-ci.yml
+1
-1
No files found.
ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
View file @
23d422b6
...
@@ -15,7 +15,7 @@ module EE
...
@@ -15,7 +15,7 @@ module EE
# rubocop:disable Gitlab/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
override
:show
override
:show
def
show
def
show
if
project
.
feature_available?
(
:license_
management
)
if
project
.
feature_available?
(
:license_
scanning
)
@license_management_url
=
expose_url
(
api_v4_projects_managed_licenses_path
(
id:
@project
.
id
))
@license_management_url
=
expose_url
(
api_v4_projects_managed_licenses_path
(
id:
@project
.
id
))
end
end
...
...
ee/app/models/ee/ci/build.rb
View file @
23d422b6
...
@@ -81,7 +81,7 @@ module EE
...
@@ -81,7 +81,7 @@ module EE
each_report
(
::
Ci
::
JobArtifact
::
LICENSE_SCANNING_REPORT_FILE_TYPES
)
do
|
file_type
,
blob
|
each_report
(
::
Ci
::
JobArtifact
::
LICENSE_SCANNING_REPORT_FILE_TYPES
)
do
|
file_type
,
blob
|
next
if
::
Feature
.
disabled?
(
:parse_license_management_reports
,
default_enabled:
true
)
next
if
::
Feature
.
disabled?
(
:parse_license_management_reports
,
default_enabled:
true
)
next
unless
project
.
feature_available?
(
:license_scanning
)
||
project
.
feature_available?
(
:license_management
)
next
unless
project
.
feature_available?
(
:license_scanning
)
::
Gitlab
::
Ci
::
Parsers
.
fabricate!
(
file_type
).
parse!
(
blob
,
license_scanning_report
)
::
Gitlab
::
Ci
::
Parsers
.
fabricate!
(
file_type
).
parse!
(
blob
,
license_scanning_report
)
end
end
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
23d422b6
...
@@ -45,8 +45,8 @@ module EE
...
@@ -45,8 +45,8 @@ module EE
container_scanning:
%i[container_scanning]
,
container_scanning:
%i[container_scanning]
,
dast:
%i[dast]
,
dast:
%i[dast]
,
performance:
%i[merge_request_performance_metrics]
,
performance:
%i[merge_request_performance_metrics]
,
license_management:
%i[license_scanning
license_management
]
,
license_management:
%i[license_scanning]
,
license_scanning:
%i[license_scanning
license_management
]
,
license_scanning:
%i[license_scanning]
,
metrics:
%i[metrics_reports]
metrics:
%i[metrics_reports]
}.
freeze
}.
freeze
...
...
ee/app/models/license.rb
View file @
23d422b6
...
@@ -120,7 +120,6 @@ class License < ApplicationRecord
...
@@ -120,7 +120,6 @@ class License < ApplicationRecord
incident_management
incident_management
insights
insights
issuable_health_status
issuable_health_status
license_management
license_scanning
license_scanning
personal_access_token_expiration_policy
personal_access_token_expiration_policy
prometheus_alerts
prometheus_alerts
...
...
ee/app/policies/ee/project_policy.rb
View file @
23d422b6
...
@@ -97,7 +97,7 @@ module EE
...
@@ -97,7 +97,7 @@ module EE
with_scope
:subject
with_scope
:subject
condition
(
:license_scanning_enabled
)
do
condition
(
:license_scanning_enabled
)
do
@subject
.
feature_available?
(
:license_scanning
)
||
@subject
.
feature_available?
(
:license_management
)
@subject
.
feature_available?
(
:license_scanning
)
end
end
with_scope
:subject
with_scope
:subject
...
...
ee/app/views/projects/merge_requests/show.html.haml
View file @
23d422b6
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
window.gl.mrWidgetData.approvals_help_path = '
#{
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
)
}
';
window.gl.mrWidgetData.approvals_help_path = '
#{
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
)
}
';
window.gl.mrWidgetData.codequality_help_path = '
#{
help_page_path
(
"user/project/merge_requests/code_quality"
,
anchor:
"code-quality-reports"
)
}
';
window.gl.mrWidgetData.codequality_help_path = '
#{
help_page_path
(
"user/project/merge_requests/code_quality"
,
anchor:
"code-quality-reports"
)
}
';
window.gl.mrWidgetData.visual_review_app_available = '
#{
@project
.
feature_available?
(
:visual_review_app
)
}
' === 'true';
window.gl.mrWidgetData.visual_review_app_available = '
#{
@project
.
feature_available?
(
:visual_review_app
)
}
' === 'true';
window.gl.mrWidgetData.license_scanning_comparison_path = '
#{
license_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:license_
management
)
}
'
window.gl.mrWidgetData.license_scanning_comparison_path = '
#{
license_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:license_
scanning
)
}
'
window.gl.mrWidgetData.container_scanning_comparison_path = '
#{
container_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:container_scanning
)
}
'
window.gl.mrWidgetData.container_scanning_comparison_path = '
#{
container_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:container_scanning
)
}
'
window.gl.mrWidgetData.dependency_scanning_comparison_path = '
#{
dependency_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:dependency_scanning
)
}
'
window.gl.mrWidgetData.dependency_scanning_comparison_path = '
#{
dependency_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:dependency_scanning
)
}
'
window.gl.mrWidgetData.sast_comparison_path = '
#{
sast_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:sast
)
}
'
window.gl.mrWidgetData.sast_comparison_path = '
#{
sast_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:sast
)
}
'
...
...
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
23d422b6
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
project
=
local_assigns
.
fetch
(
:project
)
-
project
=
local_assigns
.
fetch
(
:project
)
-
license_management_settings_path
=
can?
(
current_user
,
:admin_software_license_policy
,
project
)
?
license_management_settings_path
(
project
)
:
nil
-
license_management_settings_path
=
can?
(
current_user
,
:admin_software_license_policy
,
project
)
?
license_management_settings_path
(
project
)
:
nil
-
licenses_api_path
=
licenses_project_pipeline_path
(
project
,
pipeline
)
if
project
.
feature_available?
(
:license_
management
)
-
licenses_api_path
=
licenses_project_pipeline_path
(
project
,
pipeline
)
if
project
.
feature_available?
(
:license_
scanning
)
-
vulnerabilities_endpoint_path
=
expose_path
(
api_v4_projects_vulnerability_findings_path
(
id:
project
.
id
,
params:
{
pipeline_id:
pipeline
.
id
,
scope:
'dismissed'
}))
-
vulnerabilities_endpoint_path
=
expose_path
(
api_v4_projects_vulnerability_findings_path
(
id:
project
.
id
,
params:
{
pipeline_id:
pipeline
.
id
,
scope:
'dismissed'
}))
-
vulnerability_exports_endpoint_path
=
expose_path
(
api_v4_security_projects_vulnerability_exports_path
(
id:
project
.
id
))
-
vulnerability_exports_endpoint_path
=
expose_path
(
api_v4_security_projects_vulnerability_exports_path
(
id:
project
.
id
))
-
codequality_report_download_path
=
pipeline
.
downloadable_path_for_report_type
(
:codequality
)
-
codequality_report_download_path
=
pipeline
.
downloadable_path_for_report_type
(
:codequality
)
...
...
ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
View file @
23d422b6
-
return
unless
@project
.
feature_available?
(
:license_
management
)
-
return
unless
@project
.
feature_available?
(
:license_
scanning
)
-
expanded
=
expanded_by_default?
-
expanded
=
expanded_by_default?
%section
.settings.no-animate
#js-license-management
{
class:
(
'expanded'
if
expanded
),
data:
{
qa_selector:
'license_compliance_settings_content'
}
}
%section
.settings.no-animate
#js-license-management
{
class:
(
'expanded'
if
expanded
),
data:
{
qa_selector:
'license_compliance_settings_content'
}
}
...
...
ee/spec/policies/project_policy_spec.rb
View file @
23d422b6
...
@@ -660,7 +660,7 @@ describe ProjectPolicy do
...
@@ -660,7 +660,7 @@ describe ProjectPolicy do
end
end
describe
'admin_license_management'
do
describe
'admin_license_management'
do
context
'without license
management
feature available'
do
context
'without license
scanning
feature available'
do
before
do
before
do
stub_licensed_features
(
license_scanning:
false
)
stub_licensed_features
(
license_scanning:
false
)
end
end
...
@@ -720,7 +720,7 @@ describe ProjectPolicy do
...
@@ -720,7 +720,7 @@ describe ProjectPolicy do
end
end
describe
'read_software_license_policy'
do
describe
'read_software_license_policy'
do
context
'without license
management
feature available'
do
context
'without license
scanning
feature available'
do
before
do
before
do
stub_licensed_features
(
license_scanning:
false
)
stub_licensed_features
(
license_scanning:
false
)
end
end
...
...
lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
View file @
23d422b6
...
@@ -17,7 +17,7 @@ license_management:
...
@@ -17,7 +17,7 @@ license_management:
refs
:
refs
:
-
branches
-
branches
variables
:
variables
:
-
$GITLAB_FEATURES =~ /\blicense_
management
\b/
-
$GITLAB_FEATURES =~ /\blicense_
scanning
\b/
except
:
except
:
refs
:
refs
:
-
master
-
master
...
...
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