diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-09-11 11:29:54 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-09-11 11:29:54 +0000 |
| commit | e4b28b42c3b125a7836eaabf77c2fe6df4639429 (patch) | |
| tree | fe105df7ee7fbbbb90237b9fe9e5b9afa73b27bc | |
| parent | dc70b30bceaf8c44dcaf04acd830c6111423fa19 (diff) | |
| parent | 9e1608e7212eb56d61f97bc4fbd274593a195f8e (diff) | |
| download | gitlab-ce-e4b28b42c3b125a7836eaabf77c2fe6df4639429.tar.gz | |
Merge branch '13085-license-information-in-dependency-list-add-docs' into 'master'
Update docs for added licenses in dependency list
See merge request gitlab-org/gitlab-ce!32389
| -rw-r--r-- | doc/user/application_security/dependency_list/img/dependency_list_v12_2.png | bin | 207114 -> 0 bytes | |||
| -rw-r--r-- | doc/user/application_security/dependency_list/img/dependency_list_v12_3.png | bin | 0 -> 622199 bytes | |||
| -rw-r--r-- | doc/user/application_security/dependency_list/index.md | 10 | ||||
| -rw-r--r-- | doc/user/permissions.md | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/doc/user/application_security/dependency_list/img/dependency_list_v12_2.png b/doc/user/application_security/dependency_list/img/dependency_list_v12_2.png Binary files differdeleted file mode 100644 index af9cee08d71..00000000000 --- a/doc/user/application_security/dependency_list/img/dependency_list_v12_2.png +++ /dev/null diff --git a/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png b/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png Binary files differnew file mode 100644 index 00000000000..1ae44687ed5 --- /dev/null +++ b/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png diff --git a/doc/user/application_security/dependency_list/index.md b/doc/user/application_security/dependency_list/index.md index 38c38bbd8a9..4f51ff4a50b 100644 --- a/doc/user/application_security/dependency_list/index.md +++ b/doc/user/application_security/dependency_list/index.md @@ -17,7 +17,7 @@ sidebar. ## Viewing dependencies - + Dependencies are displayed with the following information: @@ -28,6 +28,7 @@ Dependencies are displayed with the following information: | Version | The exact locked version of the dependency your project uses | | Packager | The packager used to install the depedency | | Location | A link to the packager-specific lockfile in your project that declared the dependency | +| License | Links to dependency's software licenses | Dependencies shown are initially sorted by their names. They can also be sorted by the packager they were installed by, or by the severity of their known @@ -43,6 +44,13 @@ If a dependency has known vulnerabilities, they can be viewed by clicking on the `Status` cell of that dependency. The severity and description of each vulnerability will then be displayed below it. +## Licenses + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/10536) in GitLab Ultimate 12.3. + +If the [License Compliance](../license_compliance/index.md) CI job is configured, +the [discovered licenses](../license_compliance/index.md#supported-languages-and-package-managers) will be displayed on this page. + ## Downloading the Dependency List Your project's full list of dependencies and their details can be downloaded in diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 02b5f7437ee..07a30fa5a93 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -50,6 +50,7 @@ The following table depicts the various user permission levels in a project. | View License Compliance reports **(ULTIMATE)** | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | | View Security reports **(ULTIMATE)** | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | | View Dependency list **(ULTIMATE)** | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | +| View licenses in Dependency list **(ULTIMATE)** | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | | View [Design Management](project/issues/design_management.md) pages **(PREMIUM)** | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | | View project code | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | | Pull project code | ✓ (*1*) | ✓ | ✓ | ✓ | ✓ | |
