From 13867d66e92c2fd8962a126db4fbdc32891343c9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Dec 2019 09:08:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/operations/error_tracking.md | 11 ++++++++--- .../operations/img/error_details_with_issue_v12_6.png | Bin 0 -> 50767 bytes doc/user/project/service_desk.md | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 doc/user/project/operations/img/error_details_with_issue_v12_6.png (limited to 'doc/user/project') diff --git a/doc/user/project/operations/error_tracking.md b/doc/user/project/operations/error_tracking.md index 01143489a03..230e388d497 100644 --- a/doc/user/project/operations/error_tracking.md +++ b/doc/user/project/operations/error_tracking.md @@ -53,7 +53,12 @@ From error list, users can navigate to the error details page by clicking the ti This page has: - A link to the Sentry issue. -- A full stack trace along with other details. -- Ability to create an issue from a Sentry error. +- Other details about the issue, including a full stack trace. -![Error Details](img/error_details_v12_6.png) +If the error has not been linked to an existing GitLab issue, a 'Create Issue' button will be visible: + +![Error Details without Issue Link](img/error_details_v12_6.png) + +If a link does exist, it will be shown in the details and the 'Create Issue' button will be hidden: + +![Error Details with Issue Link](img/error_details_with_issue_v12_6.png) diff --git a/doc/user/project/operations/img/error_details_with_issue_v12_6.png b/doc/user/project/operations/img/error_details_with_issue_v12_6.png new file mode 100644 index 00000000000..963b70bd1e4 Binary files /dev/null and b/doc/user/project/operations/img/error_details_with_issue_v12_6.png differ diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md index 3a354e1a4f4..fad4af7102a 100644 --- a/doc/user/project/service_desk.md +++ b/doc/user/project/service_desk.md @@ -55,7 +55,7 @@ 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** and scroll down to the **Service Desk** +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: -- cgit v1.2.3