summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 09:08:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 09:08:24 +0000
commit728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (patch)
tree4bc3b6a859681de3bbeabd7bf2ec5ffd756f3a0a /doc/user/project
parentea20020f71c7226d57b6449b1d9b6c6f1298223e (diff)
downloadgitlab-ce-728a207ea6a99a4bddc16dbbe82294d3fdb60fe4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/operations/error_tracking.md12
-rw-r--r--doc/user/project/operations/img/error_details_with_issue_v12_7.pngbin0 -> 80625 bytes
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/user/project/operations/error_tracking.md b/doc/user/project/operations/error_tracking.md
index 5246f8072e2..f76c9d9912b 100644
--- a/doc/user/project/operations/error_tracking.md
+++ b/doc/user/project/operations/error_tracking.md
@@ -55,13 +55,13 @@ This page has:
- A link to the Sentry issue.
- Other details about the issue, including a full stack trace.
-If the error has not been linked to an existing GitLab issue, a 'Create Issue' button will be visible:
+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:
+If a link does exist, it will be shown in the details and the 'Create issue' button will change to a 'View issue' button:
-![Error Details with Issue Link](img/error_details_with_issue_v12_6.png)
+![Error Details with Issue Link](img/error_details_with_issue_v12_7.png)
## Taking Action on errors
@@ -74,3 +74,9 @@ You can take action on Sentry Errors from within the GitLab UI.
From within the [Error Details](#error-details) page you can ignore a Sentry error by simply clicking the **Ignore** button near the top of the page.
Ignoring an error will prevent it from appearing in the [Error Tracking List](#error-tracking-list), and will silence notifications that were set up within Sentry.
+
+### Resolving errors
+
+From within the [Error Details](#error-details) page you can resolve a Sentry error by simply clicking the **Resolve** button near the top of the page.
+
+Marking an error as resolved indicates that the error has stopped firing events. If another event occurs, the error reverts to unresolved.
diff --git a/doc/user/project/operations/img/error_details_with_issue_v12_7.png b/doc/user/project/operations/img/error_details_with_issue_v12_7.png
new file mode 100644
index 00000000000..aa846ee7220
--- /dev/null
+++ b/doc/user/project/operations/img/error_details_with_issue_v12_7.png
Binary files differ