summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-30 00:09:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-30 00:09:37 +0000
commit0ec841b7f902243b832f11b352f215bd93bc680b (patch)
treeefc80df932176a4d9e99377acf720fcdd5f2bf0a /doc/user
parent82f5f2485b37ea938d11181f3e05ddf35ab1959e (diff)
downloadgitlab-ce-0ec841b7f902243b832f11b352f215bd93bc680b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/issues/managing_issues.md2
-rw-r--r--doc/user/project/service_desk.md2
-rw-r--r--doc/user/project/settings/index.md4
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index aafcc5cc4d6..b68efe89cc2 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -50,7 +50,7 @@ create issues for the same project.
![Create issue from group-level issue tracker](img/create_issue_from_group_level_issue_tracker.png)
-### New issue via Service Desk **(PREMIUM)**
+### New issue via Service Desk **(STARTER)**
Enable [Service Desk](../service_desk.md) for your project and offer email support.
By doing so, when your customer sends a new email, a new issue can be created in
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index 35119459bbe..5c1b952384d 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -1,4 +1,4 @@
-# Service Desk **(PREMIUM)**
+# Service Desk **(Starter)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/149) in [GitLab Premium 9.1](https://about.gitlab.com/releases/2017/04/22/gitlab-9-1-released/#service-desk-eep).
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index fd226836d4e..b7b3f2a2711 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -67,7 +67,7 @@ Some features depend on others:
- If you disable the **Issues** option, GitLab also removes the following
features:
- **Issue Boards**
- - [**Service Desk**](#service-desk-premium) **(PREMIUM)**
+ - [**Service Desk**](#service-desk-starter) **(STARTER)**
NOTE: **Note:**
When the **Issues** option is disabled, you can still access **Milestones**
@@ -106,7 +106,7 @@ Set up your project's merge request settings:
![project's merge request settings](img/merge_requests_settings.png)
-### Service Desk **(PREMIUM)**
+### Service Desk **(STARTER)**
Enable [Service Desk](../service_desk.md) for your project to offer customer support.