diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 11:57:56 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 11:57:56 +0300 |
commit | 122e764f9b9d0deb331d21284172c2e7bef34431 (patch) | |
tree | e5a05f6e586b8b9d89aa66686c1b3fb32f966581 /doc/user | |
parent | c83c0e93619055a5aa3ebf87807c62964c5ef7c2 (diff) | |
parent | 12851359262aaa2c2b91304b0ffcb8cc4f474790 (diff) |
Merge branch 'docs-products-links' into 'master'
Updated /products links to /pricing
See merge request gitlab-org/gitlab-ce!20321
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/index.md | 2 | ||||
-rw-r--r-- | doc/user/permissions.md | 2 | ||||
-rw-r--r-- | doc/user/project/clusters/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/issue_board.md | 2 | ||||
-rw-r--r-- | doc/user/project/issues/index.md | 6 | ||||
-rw-r--r-- | doc/user/project/issues/issues_functionalities.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/repository/index.md | 6 | ||||
-rw-r--r-- | doc/user/project/settings/index.md | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/doc/user/index.md b/doc/user/index.md index edf50019c2f..90f0e2285c3 100644 --- a/doc/user/index.md +++ b/doc/user/index.md @@ -7,7 +7,7 @@ description: 'Read through the GitLab User documentation to learn how to use, co Welcome to GitLab! We're glad to have you here! As a GitLab user you'll have access to all the features -your [subscription](https://about.gitlab.com/products/) +your [subscription](https://about.gitlab.com/pricing/) includes, except [GitLab administrator](../README.md#administrator-documentation) settings, unless you have admin privileges to install, configure, and upgrade your GitLab instance. diff --git a/doc/user/permissions.md b/doc/user/permissions.md index a35bf48e62d..b6438397db8 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -313,4 +313,4 @@ Read through the documentation on [LDAP users permissions](https://docs.gitlab.c [ce-18994]: https://gitlab.com/gitlab-org/gitlab-ce/issues/18994 [new-mod]: project/new_ci_build_permissions_model.md [ee-998]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/998 -[eep]: https://about.gitlab.com/products/ +[eep]: https://about.gitlab.com/pricing/ diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 20c46cafbe5..b25b09f7b1f 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -406,5 +406,5 @@ the deployment variables above, ensuring any pods you create are labelled with - [Connecting and deploying to an Amazon EKS cluster](eks_and_gitlab/index.md) [permissions]: ../../permissions.md -[ee]: https://about.gitlab.com/products/ +[ee]: https://about.gitlab.com/pricing/ [Auto DevOps]: ../../../topics/autodevops/index.md diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index 10647e33f4c..e97b5d05529 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -70,7 +70,7 @@ beginning of the development lifecycle until deployed to production ### Use cases for Multiple Issue Boards With [Multiple Issue Boards](#multiple-issue-boards), available only in -[GitLab Enterprise Edition](https://about.gitlab.com/products/), +[GitLab Enterprise Edition](https://about.gitlab.com/pricing/), each team can have their own board to organize their workflow individually. #### Scrum team diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md index bf17731c523..d71273ba970 100644 --- a/doc/user/project/issues/index.md +++ b/doc/user/project/issues/index.md @@ -8,7 +8,7 @@ It allows you, your team, and your collaborators to share and discuss proposals before and while implementing them. GitLab Issues and the GitLab Issue Tracker are available in all -[GitLab Products](https://about.gitlab.com/products/) as +[GitLab Products](https://about.gitlab.com/pricing/) as part of the [GitLab Workflow](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/). ## Use cases @@ -35,7 +35,7 @@ your project public, open to collaboration. ### Streamline collaboration With [Multiple Assignees for Issues](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html), -available in [GitLab Starter](https://about.gitlab.com/products/) +available in [GitLab Starter](https://about.gitlab.com/pricing/) you can streamline collaboration and allow shared responsibilities to be clearly displayed. All assignees are shown across your workflows and receive notifications (as they would as single assignees), simplifying communication and ownership. @@ -139,7 +139,7 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue Read through the documentation for [Issue Boards](../issue_board.md) to find out more about this feature. -With [GitLab Starter](https://about.gitlab.com/products/), you can also +With [GitLab Starter](https://about.gitlab.com/pricing/), you can also create various boards per project with [Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards). ### External Issue Tracker diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md index e9903b01c82..46f25417fde 100644 --- a/doc/user/project/issues/issues_functionalities.md +++ b/doc/user/project/issues/issues_functionalities.md @@ -47,7 +47,7 @@ Often multiple people likely work on the same issue together, which can especially be difficult to track in large teams where there is shared ownership of an issue. -In [GitLab Starter](https://about.gitlab.com/products/), you can also +In [GitLab Starter](https://about.gitlab.com/pricing/), you can also select multiple assignees to an issue. Learn more on the [Multiple Assignees documentation](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html). diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 5e2e0c3d171..483a54051d7 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -325,4 +325,4 @@ git checkout origin/merge-requests/1 ``` [protected branches]: ../protected_branches.md -[ee]: https://about.gitlab.com/products/ "GitLab Enterprise Edition" +[ee]: https://about.gitlab.com/pricing/ "GitLab Enterprise Edition" diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md index bda293bd00e..704c1777e62 100644 --- a/doc/user/project/repository/index.md +++ b/doc/user/project/repository/index.md @@ -82,7 +82,7 @@ your implementation with your team. You can live preview changes submitted to a new branch with [Review Apps](../../../ci/review_apps/index.md). -With [GitLab Starter](https://about.gitlab.com/products/), you can also request +With [GitLab Starter](https://about.gitlab.com/pricing/), you can also request [approval](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers. To create, delete, and [branches](branches/index.md) via GitLab's UI: @@ -165,12 +165,12 @@ Find it under your project's **Repository > Compare**. ## Locked files -> Available in [GitLab Premium](https://about.gitlab.com/products/). +> Available in [GitLab Premium](https://about.gitlab.com/pricing/). Lock your files to prevent any conflicting changes. [File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in -[GitLab Premium](https://about.gitlab.com/products/). +[GitLab Premium](https://about.gitlab.com/pricing/). ## Repository's API diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 212e271ce6f..084d1161633 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -42,7 +42,7 @@ Set up your project's merge request settings: ### Service Desk -Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/products/). +Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/pricing/). ### Export project |