diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 00:08:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 00:08:02 +0000 |
commit | eaa4c07484704aab1cca90d96fc018783883fc24 (patch) | |
tree | a420b42c5e6856f83e94cf9262a82024028ddf9b /doc/user/project | |
parent | b558264c9d10841f46a8ffeb15f18d0cee60fa7a (diff) | |
download | gitlab-ce-eaa4c07484704aab1cca90d96fc018783883fc24.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/img/service_desk_disabled.png | bin | 25013 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/img/service_desk_enabled.png | bin | 59684 -> 51597 bytes | |||
-rw-r--r-- | doc/user/project/img/service_desk_nav_item.png | bin | 30323 -> 19103 bytes | |||
-rw-r--r-- | doc/user/project/service_desk.md | 59 |
4 files changed, 27 insertions, 32 deletions
diff --git a/doc/user/project/img/service_desk_disabled.png b/doc/user/project/img/service_desk_disabled.png Binary files differdeleted file mode 100644 index ba11b508682..00000000000 --- a/doc/user/project/img/service_desk_disabled.png +++ /dev/null diff --git a/doc/user/project/img/service_desk_enabled.png b/doc/user/project/img/service_desk_enabled.png Binary files differindex aee2b53a680..4261fde3a6e 100644 --- a/doc/user/project/img/service_desk_enabled.png +++ b/doc/user/project/img/service_desk_enabled.png diff --git a/doc/user/project/img/service_desk_nav_item.png b/doc/user/project/img/service_desk_nav_item.png Binary files differindex 3420e355f67..e8f1cedb793 100644 --- a/doc/user/project/img/service_desk_nav_item.png +++ b/doc/user/project/img/service_desk_nav_item.png diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md index fad4af7102a..59c67cdda2f 100644 --- a/doc/user/project/service_desk.md +++ b/doc/user/project/service_desk.md @@ -48,43 +48,38 @@ users will only see the thread through email. ## Configuring Service Desk -> **Note:** -Service Desk is enabled on GitLab.com. If you're a -[Silver subscriber](https://about.gitlab.com/pricing/#gitlab-com), -you can skip the step 1 below; you only need to enable it per project. - -1. [Set up incoming email](../../administration/incoming_email.md#set-it-up) for the GitLab instance. This must - support [email sub-addressing](../../administration/incoming_email.md#email-sub-addressing). -1. Navigate to your project's **Settings > General** and scroll down to the **Service Desk** - section. -1. If you have the correct access and a Premium license, - you will see an option to set up Service Desk: - - ![Activate Service Desk option](img/service_desk_disabled.png) - -1. Checking that box will enable Service Desk for the project, and show a - unique email address to email issues to the project. These issues will be - [confidential](issues/confidential_issues.md), so they will only be visible to project members. - - **Warning**: this email address can be used by anyone to create an issue on - this project, whether or not they have access to your GitLab instance. - We recommend **putting this behind an alias** so that it can be changed if - needed, and **[enabling Akismet](../../integration/akismet.md)** on your GitLab instance to add spam - checking to this service. Unblocked email spam would result in many spam +NOTE: **Note:** +Service Desk is enabled on GitLab.com. If you're a [Silver subscriber](https://about.gitlab.com/pricing/#gitlab-com), +you can skip step 1 below; you only need to enable it per project. + +If you have the correct access and a Premium license, you have the option to set up Service Desk. +Follow these steps to do so: + +1. [Set up incoming email](../../administration/incoming_email.md#set-it-up) for the GitLab instance. + This must support [email sub-addressing](../../administration/incoming_email.md#email-sub-addressing). +1. Navigate to your project's **Settings > General** and locate the **Service Desk** section. +1. Enable the **Activate Service Desk** toggle. This reveals a unique email address to email issues + to the project. These issues will be [confidential](issues/confidential_issues.md), so they will + only be visible to project members. Note that in GitLab 11.7, we updated the generated email + address's format. The older format is still supported, however, allowing existing aliases or + contacts to continue working. + + DANGER: **Danger:** + This email address can be used by anyone to create an issue on this project, whether or not they + have access to your GitLab instance. We recommend **putting this behind an alias** so it can be + changed if needed, and **[enabling Akismet](../../integration/akismet.md)** on your GitLab + instance to add spam checking to this service. Unblocked email spam would result in many spam issues being created, and may disrupt your GitLab service. - ![Service Desk enabled](img/service_desk_enabled.png) - - _In GitLab 11.7, we updated the format of the generated email address. - However the older format is still supported, allowing existing aliases - or contacts to continue working._ + If you have [templates](description_templates.md) in your repository, you can optionally select + one from the selector menu to append it to all Service Desk issues. -1. If you have [templates](description_templates.md) in your repository, then you can optionally - select one of these templates from the dropdown to append it to all Service Desk issues. + ![Service Desk enabled](img/service_desk_enabled.png) -1. Service Desk is now enabled for this project! You should be able to access it from your project's navigation **Issue submenu**: +Service Desk is now enabled for this project! You should be able to access it from your project +navigation's **Issues** menu. - ![Service Desk Navigation Item](img/service_desk_nav_item.png) +![Service Desk Navigation Item](img/service_desk_nav_item.png) ## Using Service Desk |