diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
| commit | 390582e118752426acf5cb25ec99103d312d891c (patch) | |
| tree | bb0b1a6a46632024ffc3ba1983e4ebcb0fab4428 /doc/user | |
| parent | 1ea1db491c8bc90789acda45c9002aaa5c4dc498 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/license_compliance/index.md | 5 | ||||
| -rw-r--r-- | doc/user/packages/container_registry/img/expiration-policy-app.png | bin | 90268 -> 93286 bytes | |||
| -rw-r--r-- | doc/user/packages/container_registry/index.md | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/user/application_security/license_compliance/index.md b/doc/user/application_security/license_compliance/index.md index fb6fa0632f6..ee8c4b8774c 100644 --- a/doc/user/application_security/license_compliance/index.md +++ b/doc/user/application_security/license_compliance/index.md @@ -179,9 +179,10 @@ If you still need to run tests during `mvn install`, add `-DskipTests=false` to ### Selecting the version of Python > - [Introduced](https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/36) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0. -> - In GitLab 12.2, Python 3.5 became the default. +> - In [GitLab 12.2](https://gitlab.com/gitlab-org/gitlab/issues/12032), Python 3.5 became the default. +> - In [GitLab 12.7](https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/101), Python 3.8 became the default. -License Compliance uses Python 3.5 and pip 19.1 by default. +License Compliance uses Python 3.8 and pip 19.1 by default. If your project requires Python 2, you can switch to Python 2.7 and pip 10.0 by setting the `LM_PYTHON_VERSION` environment variable to `2`. diff --git a/doc/user/packages/container_registry/img/expiration-policy-app.png b/doc/user/packages/container_registry/img/expiration-policy-app.png Binary files differindex 38de4d85ae5..e353fe27b2a 100644 --- a/doc/user/packages/container_registry/img/expiration-policy-app.png +++ b/doc/user/packages/container_registry/img/expiration-policy-app.png diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md index 97831d65759..b10430633ff 100644 --- a/doc/user/packages/container_registry/index.md +++ b/doc/user/packages/container_registry/index.md @@ -177,7 +177,7 @@ The UI allows you to configure the following: - **Expiration interval:** how long tags are exempt from being deleted. - **Expiration schedule:** how often the cron job checking the tags should run. - **Expiration latest:** how many tags to _always_ keep for each image. -- **Expire Docker tags with regex matching:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`. +- **Docker tags with names matching this regex pattern will expire:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`. ## Troubleshooting the GitLab Container Registry |
