Commit 3c7cd2f9 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'ee-jl-fix-object-storage-support-docs' into 'master'

Fix formatting of object storage supported editions

See merge request gitlab-org/gitlab-ee!6372
parents 4cefac10 e24b3345
...@@ -88,11 +88,12 @@ _The artifacts are stored by default in ...@@ -88,11 +88,12 @@ _The artifacts are stored by default in
### Using object storage ### Using object storage
>**Notes:** >**Notes:**
- [Introduced][ee-1762] in [GitLab Premium][eep] 9.4. - [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1762) in
- Since version 9.5, artifacts are [browsable], when object storage is enabled. [GitLab Premium](https://about.gitlab.com/pricing/) 9.4.
9.4 lacks this feature. - Since version 9.5, artifacts are [browsable](../user/project/pipelines/job_artifacts.md#browsing-artifacts),
> Since version 10.6, available in [GitLab Core](https://about.gitlab.com/pricing/) when object storage is enabled. 9.4 lacks this feature.
> Since version 11.0, we support direct_upload to S3. - 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 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. artifacts, you can use an object storage like AWS S3 instead.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment