diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 08:57:56 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 08:57:56 +0000 |
| commit | 122e764f9b9d0deb331d21284172c2e7bef34431 (patch) | |
| tree | e5a05f6e586b8b9d89aa66686c1b3fb32f966581 /doc/administration | |
| parent | c83c0e93619055a5aa3ebf87807c62964c5ef7c2 (diff) | |
| parent | 12851359262aaa2c2b91304b0ffcb8cc4f474790 (diff) | |
| download | gitlab-ce-122e764f9b9d0deb331d21284172c2e7bef34431.tar.gz | |
Merge branch 'docs-products-links' into 'master'
Updated /products links to /pricing
See merge request gitlab-org/gitlab-ce!20321
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/index.md | 2 | ||||
| -rw-r--r-- | doc/administration/job_artifacts.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index 0e65f9a9963..922cc45d8c4 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -11,7 +11,7 @@ Regular users don't have access to GitLab administration tools and settings. GitLab has two product distributions: the open source [GitLab Community Edition (CE)](https://gitlab.com/gitlab-org/gitlab-ce), and the open core [GitLab Enterprise Edition (EE)](https://gitlab.com/gitlab-org/gitlab-ee), -available through [different subscriptions](https://about.gitlab.com/products/). +available through [different subscriptions](https://about.gitlab.com/pricing/). You can [install GitLab CE or GitLab EE](https://about.gitlab.com/installation/ce-or-ee/), but the features you'll have access to depend on the subscription you choose diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 1bb018e368b..10228d027e8 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -91,9 +91,9 @@ _The artifacts are stored by default in - [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/products/) and +> 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/products/) +> Since version 10.6, available in [GitLab CE](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 |