From 9e1608e7212eb56d61f97bc4fbd274593a195f8e Mon Sep 17 00:00:00 2001 From: Dave Pisek Date: Thu, 29 Aug 2019 17:59:38 +1000 Subject: Update docs for licenses in dependency list This commits updates the docs (text and screenshot) to include information about the added display of licenses for a given dependency. --- .../dependency_list/img/dependency_list_v12_2.png | Bin 207114 -> 0 bytes .../dependency_list/img/dependency_list_v12_3.png | Bin 0 -> 622199 bytes doc/user/application_security/dependency_list/index.md | 10 +++++++++- doc/user/permissions.md | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) delete mode 100644 doc/user/application_security/dependency_list/img/dependency_list_v12_2.png create mode 100644 doc/user/application_security/dependency_list/img/dependency_list_v12_3.png 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 deleted file mode 100644 index af9cee08d71..00000000000 Binary files a/doc/user/application_security/dependency_list/img/dependency_list_v12_2.png and /dev/null differ 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 new file mode 100644 index 00000000000..1ae44687ed5 Binary files /dev/null and b/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png differ 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 -![Dependency List](img/dependency_list_v12_2.png) +![Dependency List](img/dependency_list_v12_3.png) 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*) | ✓ | ✓ | ✓ | ✓ | -- cgit v1.2.1