diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-21 10:11:53 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-21 10:11:53 +0000 |
commit | dff6165e8c7d9e1cadbc7c014136dab1c69df62c (patch) | |
tree | 10c79f7fea1018322ca603d06d91497c10db6775 /doc | |
parent | 77cb03166d34c25bb3383fac0065e64d544323fc (diff) | |
parent | 91cf0cb2d53b6f48560862fc121f897bb7331046 (diff) | |
download | gitlab-ce-dff6165e8c7d9e1cadbc7c014136dab1c69df62c.tar.gz |
Merge branch 'paginate-license-management' into 'master'
Backport and Docs for Paginate license management and add license search
See merge request gitlab-org/gitlab-ce!27602
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/application_security/license_management/img/license_management_add_license.png | bin | 0 -> 87049 bytes | |||
-rw-r--r-- | doc/user/application_security/license_management/img/license_management_search.png | bin | 0 -> 104278 bytes | |||
-rw-r--r-- | doc/user/application_security/license_management/img/license_management_settings.png | bin | 13300 -> 171592 bytes | |||
-rw-r--r-- | doc/user/application_security/license_management/index.md | 16 |
4 files changed, 16 insertions, 0 deletions
diff --git a/doc/user/application_security/license_management/img/license_management_add_license.png b/doc/user/application_security/license_management/img/license_management_add_license.png Binary files differnew file mode 100644 index 00000000000..1e1a698515b --- /dev/null +++ b/doc/user/application_security/license_management/img/license_management_add_license.png diff --git a/doc/user/application_security/license_management/img/license_management_search.png b/doc/user/application_security/license_management/img/license_management_search.png Binary files differnew file mode 100644 index 00000000000..7b6006cef9d --- /dev/null +++ b/doc/user/application_security/license_management/img/license_management_search.png diff --git a/doc/user/application_security/license_management/img/license_management_settings.png b/doc/user/application_security/license_management/img/license_management_settings.png Binary files differindex b5490e59074..1a2bfa78a03 100644 --- a/doc/user/application_security/license_management/img/license_management_settings.png +++ b/doc/user/application_security/license_management/img/license_management_settings.png diff --git a/doc/user/application_security/license_management/index.md b/doc/user/application_security/license_management/index.md index 7a583016586..957c4ede981 100644 --- a/doc/user/application_security/license_management/index.md +++ b/doc/user/application_security/license_management/index.md @@ -262,6 +262,8 @@ To approve or blacklist a license: navigate to the project's **Settings > CI/CD** and expand the **License Management** section. 1. Click the **Add a license** button. + + ![License Management Add License](img/license_management_add_license.png) 1. In the **License name** dropdown, either: - Select one of the available licenses. You can search for licenses in the field at the top of the list. @@ -270,8 +272,22 @@ To approve or blacklist a license: 1. Select the **Approve** or **Blacklist** radio button to approve or blacklist respectively the selected license. + + +To modify an existing license: + +1. In the **License Management** list, click the **Approved/Declined** dropdown to change it to the desired status. + ![License Management Settings](img/license_management_settings.png) +Searching for Licenses: + +1. Use the **Search** box to search for a specific license. + + ![License Management Search](img/license_management_search.png) + + + ## License Management report under pipelines > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/5491) |