diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-07-11 10:14:31 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-07-11 10:14:31 +0000 |
| commit | 7a3a52b409c145060d73d569e61c29409608b5e0 (patch) | |
| tree | 92c3d1a634ab86797176f14ea9f56c94c47b03e8 | |
| parent | 67708aa57874c7ae33581ca9f217fde82ce7be76 (diff) | |
| parent | e0cf62d8aef978aa9e5e96b7c68876a0b8e7ec9a (diff) | |
| download | gitlab-ce-7a3a52b409c145060d73d569e61c29409608b5e0.tar.gz | |
Merge branch 'jl-fix-object-storage-support-docs' into 'master'
Fix object storage support notes
See merge request gitlab-org/gitlab-ce!20344
| -rw-r--r-- | doc/administration/job_artifacts.md | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 10228d027e8..8c55c8c4298 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -88,13 +88,12 @@ _The artifacts are stored by default in ### Using object storage >**Notes:** -- [Introduced][ee-1762] in [GitLab Premium][eep] 9.4. -- Since version 9.5, artifacts are [browsable], when object storage is enabled. - 9.4 lacks this feature. -> Available in [GitLab Premium](https://about.gitlab.com/pricing/) and -[GitLab.com Silver](https://about.gitlab.com/gitlab-com/). -> Since version 10.6, available in [GitLab CE](https://about.gitlab.com/pricing/) -> Since version 11.0, we support direct_upload to S3. +- [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1762) in + [GitLab Premium](https://about.gitlab.com/pricing/) 9.4. +- Since version 9.5, artifacts are [browsable](../user/project/pipelines/job_artifacts.md#browsing-artifacts), + when object storage is enabled. 9.4 lacks this feature. +- Since version 10.6, available in [GitLab Core](https://about.gitlab.com/pricing/) +- Since version 11.0, we support `direct_upload` to S3. If you don't want to use the local disk where GitLab is installed to store the artifacts, you can use an object storage like AWS S3 instead. |