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
39d8d84c
Commit
39d8d84c
authored
Sep 24, 2019
by
mo khan
Committed by
Achilleas Pipinellis
Sep 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update documentation for License-Check rule
parent
0d8338e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
1 deletion
+34
-1
doc/user/application_security/index.md
doc/user/application_security/index.md
+24
-1
doc/user/project/merge_requests/merge_request_approvals.md
doc/user/project/merge_requests/merge_request_approvals.md
+10
-0
No files found.
doc/user/application_security/index.md
View file @
39d8d84c
...
...
@@ -151,7 +151,7 @@ Clicking on this button will create a merge request to apply the solution onto t
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9928) in [GitLab Ultimate](https://about.gitlab.com/pricing) 12.2.
Merge Request Approvals can be configured to require approval from a member
of your security team when a vulnerability would be introduced by a merge request.
of your security team when a vulnerability
, or a software license compliance violation
would be introduced by a merge request.
This threshold is defined as
`high`
,
`critical`
, or
`unknown`
severity. When any vulnerabilities are present within a merge request, an
...
...
@@ -178,6 +178,29 @@ An approval will be optional when a security report:
-
Contains no new vulnerabilities.
-
Contains only new vulnerabilities of
`low`
or
`medium`
severity.
### Enabling License Approvals within a project
To enable License Approvals, a
[
project approval rule
](
../project/merge_requests/merge_request_approvals.md#multiple-approval-rules-premium
)
must be created with the case-sensitive name
`License-Check`
. This approval
group must be set with an "Approvals required" count greater than zero.
Once this group has been added to your project, the approval rule will be enabled
for all Merge Requests. To configure how this rule behaves, you can choose which
licenses to
`approve`
or
`blacklist`
in the
[
project policies for License Compliance
](
license_compliance/index.md#project-policies-for-license-compliance
)
section.
Any code changes made will cause the count of approvals required to reset.
An approval will be required when a license report:
-
Contains a dependency that includes a software license that is
`blacklisted`
.
-
Is not generated during pipeline execution.
An approval will be optional when a license report:
-
Contains no software license violations.
-
Contains only new licenses that are
`approved`
or unknown.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
...
...
doc/user/project/merge_requests/merge_request_approvals.md
View file @
39d8d84c
...
...
@@ -337,6 +337,16 @@ of your security team when a vulnerability would be introduced by a merge reques
For more information, see
[
Security approvals in merge requests
](
../../application_security/index.md#security-approvals-in-merge-requests-ultimate
)
.
## License compliance approvals in merge requests **(ULTIMATE)**
> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing) 12.3.
Merge Request Approvals can be configured to require approval from a member
of your security team when a blacklisted software license would be introduced by a merge request.
For more information, see
[
Security approvals in merge requests
](
../../application_security/index.md#security-approvals-in-merge-requests-ultimate
)
.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
...
...
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